Bun/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

I think my flake needs a complete rewrite

Browse source
This commit is contained in:
Jimbo 2024-10-12 17:35:52 -04:00
parent 87fbcda3d3
commit 65f90a0bf3
65 changed files with 110 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

139
flake.nix
View file

@ -1,6 +1,5 @@
{
inputs = {
# Nixpkgs
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
unstable.url = "github:nixos/nixpkgs/nixos-unstable";
nur.url = "github:nix-community/NUR";
@ -29,6 +28,7 @@
nur,
mailserver,
blender-bin,
minecraft,
hardware,
lanzaboote,
home-manager,
@ -36,7 +36,7 @@
} @inputs:
let
channels = {
master = import nixpkgs {
stable = import nixpkgs {
inherit (flake) system overlays;
config.allowUnfree = true;
};
@ -51,93 +51,82 @@
(import ./overlays/mpv { inherit (self) inputs channels; })
];
packages = import ./packages/default.nix { inherit (nix) pkgs; };
secrets = import ./extras/secrets.nix;
cmd = import ./extras/cmd.nix;
displays = import ./extras/displays.nix;
ips = import ./extras/ips.nix;
look = import ./extras/look.nix;
ws = import ./extras/workspaces.nix;
};
nix = rec {
pkgs = channels.master // flake.packages;
pkgs = channels.stable // flake.packages;
inherit (pkgs) lib;
inherit (flake) channels-config;
};
mkNixos = modules: nixpkgs.lib.nixosSystem {
inherit (nix) pkgs;
system = "x86_64-linux";
specialArgs = {
inherit
inputs
;
};
};
mkHome = modules: pkgs: home-manager.lib.homeManagerConfiguration {
inherit (nix) pkgs;
};
in {
# Variables defined globally
secrets = import ./extras/secrets.nix;
cmd = import ./extras/cmd.nix;
displays = import ./extras/displays.nix;
ips = import ./extras/ips.nix;
look = import ./extras/look.nix;
ws = import ./extras/workspaces.nix;
# NixOS config entrypoint, use 'nixos-rebuild --flake .#your-hostname'
nixosConfigurations = {
JimDesktop = nixpkgs.lib.nixosSystem {
inherit (nix) pkgs;
specialArgs = { inherit inputs outputs; };
modules = [
./system/hosts/JimDesktop/configuration.nix
lanzaboote.nixosModules.lanzaboote
];
};
JimServer = nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs outputs; };
modules = [
./system/hosts/JimServer/configuration.nix
mailserver.nixosModule
];
};
JimPine = nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs outputs; };
modules = [
./system/hosts/JimPine/configuration.nix
hardware.nixosModules.pine64-pinebook-pro
];
};
JimLenovo = nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs outputs; };
modules = [
./system/hosts/JimLenovo/configuration.nix
];
};
firefly = mkNixos [
./modules/system/hardware/firefly
./modules/system
./modules/system/desktop
./modules/system/devices
./modules/system/programs
./modules/system/services/ssh
./modules/system/services/sunshine
./modules/system/services/networkfs
./modules/system/services/virtualization
lanzaboote.nixosModules.lanzaboote
];
JimServer = mkNixos [
./system/hosts/JimServer/configuration.nix
mailserver.nixosModule
];
JimPine = mkNixos [
./system/hosts/JimPine/configuration.nix
hardware.nixosModules.pine64-pinebook-pro
];
};
# Home-manager configuration, use 'home-manager --flake .#your-username@your-hostname'
homeConfigurations = {
"jimbo@JimDesktop" = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.x86_64-linux;
extraSpecialArgs = { inherit inputs outputs; };
modules = [
./home/hosts/JimDesktop/home.nix
nur.nixosModules.nur
];
};
"jimbo@JimServer" = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.x86_64-linux;
extraSpecialArgs = { inherit inputs outputs; };
modules = [
./home/hosts/JimServer/home.nix
];
};
"jimbo@JimPine" = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.aarch64-linux;
extraSpecialArgs = { inherit inputs outputs; };
modules = [
./home/hosts/JimPine/home.nix
nur.nixosModules.nur
];
};
"jimbo@JimLenovo" = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.x86_64-linux;
extraSpecialArgs = { inherit inputs outputs; };
modules = [
./home/hosts/JimLenovo/home.nix
nur.nixosModules.nur
];
};
"jimbo@JimDesktop" = mkHome [
./modules/home
./modules/home/files
./modules/home/programs
./modules/home/settings
./modules/home/sway
./modules/home/utils
nur.nixosModules.nur
];
"jimbo@JimServer" = mkHome [
./home/hosts/JimServer/home.nix
];
"jimbo@JimPine" = mkHome [
./home/hosts/JimPine/home.nix
nur.nixosModules.nur
];
# Derivation for ssh envrionments on other people's servers
"jimbo@JimTerminal" = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.x86_64-linux;
extraSpecialArgs = { inherit inputs outputs; };
modules = [
./home/hosts/JimTerminal/home.nix
];
};
"jimbo@JimTerminal" = mkHome [
./home/hosts/JimTerminal/home.nix
];
};
};
}