diff --git a/flake.nix b/flake.nix index 5412e62..d123ebb 100644 --- a/flake.nix +++ b/flake.nix @@ -113,6 +113,12 @@ }; nixosConfigurations = { + + ########################################################################## + ########################################################################## + ########################################################################## + # Physical Systems + ll-latitude-e5591 = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ @@ -121,8 +127,8 @@ networking.hostId = "f55542ee"; system.stateVersion = "24.11"; - time.timeZone = "America/Chicago"; + time.timeZone = "America/Chicago"; sops.defaultSopsFile = ./secrets.yaml; } @@ -138,6 +144,97 @@ specialArgs = { inherit inputs pkgs-unstable; }; }; + living-room = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + modules = [ + { + networking.hostName = "living-room"; + + system.stateVersion = "25.05"; + home-manager.users."lauren_lagarde".home.stateVersion = "25.05"; + + time.timeZone = "America/Chicago"; + sops.defaultSopsFile = ./secrets.yaml; + } + + ./systems/living-room/configuration.nix + + sops-nix.nixosModules.sops + lix-module.nixosModules.default + home-manager.nixosModules.home-manager + disko.nixosModules.default + ]; + specialArgs = { inherit inputs pkgs-unstable; }; + }; + + bastion = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + modules = [ + { + networking.hostName = "bastion"; + networking.hostId = "0d13f99b"; + + system.stateVersion = "24.11"; + home-manager.users."lauren_lagarde".home.stateVersion = "24.11"; + + time.timeZone = "America/Chicago"; + sops.defaultSopsFile = ./secrets.yaml; + } + + ./systems/bastion/configuration.nix + + sops-nix.nixosModules.sops + lix-module.nixosModules.default + home-manager.nixosModules.home-manager + disko.nixosModules.default + ]; + specialArgs = { inherit inputs pkgs-unstable; }; + }; + + blockhouse = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + modules = [ + { + networking.hostName = "blockhouse"; + networking.hostId = "ed658529"; + + system.stateVersion = "23.11"; + home-manager.users."lauren_lagarde".home.stateVersion = "24.11"; + + time.timeZone = "America/Chicago"; + sops.defaultSopsFile = ./secrets.yaml; + } + + ./systems/blockhouse/configuration.nix + + sops-nix.nixosModules.sops + lix-module.nixosModules.default + home-manager.nixosModules.home-manager + disko.nixosModules.default + ]; + specialArgs = { inherit inputs pkgs-unstable; }; + }; + + stronghold = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + modules = [ + { + networking.hostName = "stronghold"; + networking.hostId = "c581a1cd"; + } + ./systems/stronghold/configuration.nix + + lix-module.nixosModules.default + home-manager.nixosModules.home-manager + disko.nixosModules.default + ]; + }; + + ########################################################################## + ########################################################################## + ########################################################################## + # Other + ll-nixos-headless-pi = nixpkgs.lib.nixosSystem { system = "aarch64-linux"; modules = pi_modules ++ [ @@ -189,110 +286,6 @@ specialArgs = { inherit inputs pkgs-unstable; }; }; - # Real Systems - living-room = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - modules = [ - { - networking.hostName = "living-room"; - - system.stateVersion = "25.05"; - time.timeZone = "America/Chicago"; - - # System-managed home-manager - home-manager.users."lauren_lagarde" = { - home.stateVersion = "25.05"; - nixpkgs.config.allowUnfree = true; - imports = self.homeManagerModules."lauren_lagarde@living-room"; - }; - - sops.defaultSopsFile = ./secrets.yaml; - } - ./systems/living-room/configuration.nix - - sops-nix.nixosModules.sops - lix-module.nixosModules.default - home-manager.nixosModules.home-manager - disko.nixosModules.default - ]; - specialArgs = { inherit inputs pkgs-unstable; }; - }; - - bastion = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - modules = [ - { - networking.hostName = "bastion"; - networking.hostId = "0d13f99b"; - - system.stateVersion = "24.11"; - time.timeZone = "America/Chicago"; - - # System-managed home-manager - home-manager.users."lauren_lagarde" = { - home.stateVersion = "24.11"; - nixpkgs.config.allowUnfree = true; - imports = self.homeManagerModules."lauren_lagarde"; - }; - - sops.defaultSopsFile = ./secrets.yaml; - } - - ./systems/bastion/configuration.nix - - sops-nix.nixosModules.sops - lix-module.nixosModules.default - home-manager.nixosModules.home-manager - disko.nixosModules.default - ]; - specialArgs = { inherit inputs pkgs-unstable; }; - }; - - blockhouse = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - modules = [ - { - networking.hostName = "blockhouse"; - networking.hostId = "ed658529"; - - system.stateVersion = "23.11"; - time.timeZone = "America/Chicago"; - - # System-managed home-manager - home-manager.users."lauren_lagarde" = { - home.stateVersion = "24.11"; - nixpkgs.config.allowUnfree = true; - imports = self.homeManagerModules."lauren_lagarde"; - }; - - sops.defaultSopsFile = ./secrets.yaml; - } - - ./systems/blockhouse/configuration.nix - - sops-nix.nixosModules.sops - lix-module.nixosModules.default - home-manager.nixosModules.home-manager - disko.nixosModules.default - ]; - specialArgs = { inherit inputs pkgs-unstable; }; - }; - - stronghold = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - modules = [ - { - networking.hostName = "stronghold"; - networking.hostId = "c581a1cd"; - } - ./systems/stronghold/configuration.nix - - lix-module.nixosModules.default - home-manager.nixosModules.home-manager - disko.nixosModules.default - ]; - }; - vm-docker-luks-test = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ @@ -360,88 +353,5 @@ # specialArgs = { inherit inputs pkgs-unstable; }; # }; #}; - - packages.x86_64-linux = { - - ########################################################################## - ########################################################################## - ########################################################################## - # Personal Live Disks - - # TODO: ll-nixos-headless-iso = nixos-generators.nixosGenerate {}; - - #ll-nixos-base-iso = nixos-generators.nixosGenerate { - # system = "x86_64-linux"; - # modules = [ - # { - # networking.hostName = "ll-nixos"; - # home-manager.users."lauren_lagarde" = { - # nixpkgs.config.allowUnfree = true; - # imports = inputs.mlaga97-home-manager.homeManagerModules."lauren_lagarde@ll-latitude-e5591"; - # }; - # } - # ./systems/ll-nixos-base.nix - # lix-module.nixosModules.default - # home-manager.nixosModules.home-manager - # ]; - # specialArgs = { - # inherit inputs pkgs-unstable; - # }; - # format = "install-iso"; - #}; - - #ll-nixos-full-iso = nixos-generators.nixosGenerate { - # system = "x86_64-linux"; - # modules = [ - # { - # networking.hostName = "ll-nixos"; - # home-manager.users."lauren_lagarde" = { config, ... }: { - # nixpkgs.config.allowUnfree = true; - # imports = inputs.mlaga97-home-manager.homeManagerModules."lauren_lagarde@ll-latitude-e5591"; - # }; - # } - # ./systems/ll-nixos-full.nix - - # lix-module.nixosModules.default - # home-manager.nixosModules.home-manager - # waveforms.nixosModule - # disko.nixosModules.default - # ]; - # specialArgs = { - # inherit inputs pkgs-unstable; - # }; - # format = "install-iso"; - #}; - - #ll-nixos-xmrig-worker-iso = nixos-generators.nixosGenerate { - # system = "x86_64-linux"; - # modules = [ - # { networking.hostName = "ll-nixos-xmrig-worker"; } - # ./systems/ll-nixos-xmrig-worker.nix - # lix-module.nixosModules.default - # home-manager.nixosModules.home-manager - # ]; - # format = "install-iso"; - #}; - - ########################################################################## - ########################################################################## - ########################################################################## - # Systems - - #living-room-nixos-iso = nixos-generators.nixosGenerate { - # system = "x86_64-linux"; - # modules = [ - # { networking.hostName = "living-room-nixos-iso"; } - # ./systems/living-room-nixos.nix - # lix-module.nixosModules.default - # home-manager.nixosModules.home-manager - # ]; - # format = "install-iso"; - # specialArgs = { inherit inputs pkgs-unstable; }; - #}; - - #default = self.packages.x86_64-linux.ll-nixos-full-iso; - }; }; } diff --git a/systems/bastion/configuration.nix b/systems/bastion/configuration.nix index a671fcf..43f9990 100644 --- a/systems/bastion/configuration.nix +++ b/systems/bastion/configuration.nix @@ -2,6 +2,15 @@ # https://xcp-ng.org/docs/networking.html#intel-i218-i219-slow-speed # https://serverfault.com/questions/581265/disable-tcp-checksum-offloading-on-kvm-virtual-network { pkgs, ... }: { + # System Info: + # - Model: Dell OptiPlex 7060 Micro + # - CPU: Intel Core i7-8700T (6C/12T, Passmark: 2301/10172) + # - RAM: 32GB + # - Storage: + # - PNY CS900 PNY244624111201023FB 1TB SATA SSD + # - Samsung 970 EVO Plus S58SNG0MA07159M 500GB NVMe SSD + # - WD MyBook 25EE 3145484E3348454E 8TB External HDD + imports = [ # Core Features ../../nixos/features/base.nix @@ -21,6 +30,7 @@ # Users ../../users/lauren_lagarde/lauren_lagarde.nix + ../../users/lauren_lagarde/system-managed-home.nix ../../users/ashley_funkhouser/ashley_funkhouser.nix # Bastion Features diff --git a/systems/blockhouse/configuration.nix b/systems/blockhouse/configuration.nix index bd70b8b..11d9187 100755 --- a/systems/blockhouse/configuration.nix +++ b/systems/blockhouse/configuration.nix @@ -1,4 +1,10 @@ { config, lib, pkgs, modulesPath, ... }: { + # System Info: + # - Model: Custom + # - CPU: AMD Ryzen 9 3900X (12C/24T, Passmark: 2703/32546) + # - RAM: 128GB + # - Storage: Yes + imports = [ # Core Features ../../nixos/features/base.nix @@ -18,6 +24,7 @@ # Users ../../users/lauren_lagarde/lauren_lagarde.nix + ../../users/lauren_lagarde/system-managed-home.nix ../../users/ashley_funkhouser/ashley_funkhouser.nix # Blockhouse Features diff --git a/systems/living-room/configuration.nix b/systems/living-room/configuration.nix index e682335..5a05bb9 100644 --- a/systems/living-room/configuration.nix +++ b/systems/living-room/configuration.nix @@ -1,4 +1,11 @@ { config, pkgs, ... }: { + # System Info: + # - Model: Dell OptiPlex 3040 Micro + # - CPU: Intel Core i3-6100T (2C/4T, Passmark: 1859/3642) + # - RAM: 16GB + # - Storage: + # - ADATA SP550 2G3720040332 240GB SATA SSD + imports = [ # Core Features ../../nixos/features/base.nix @@ -11,12 +18,13 @@ ../../nixos/tweaks/disable_nixos_user.nix ../../nixos/tweaks/systemd-resolved_nonsense.nix - # Lauren Base + # Users + ../../users/lauren_lagarde/autologin.nix ../../users/lauren_lagarde/lauren_lagarde.nix + ../../users/lauren_lagarde/system-managed-home.nix # i3wm ../../nixos/features/i3wm.nix - #../../nixos/tweaks/intel_igpu_screen_tearing.nix # Dotspace ../../secrets/dotspace.nix @@ -26,7 +34,6 @@ # living-room ../../nixos/features/gpu/intel.nix ../../nixos/features/systemd-boot.nix - ../../users/lauren_lagarde/autologin.nix # TODO: Composable Disko Config ]; diff --git a/systems/ll-latitude-e5591/configuration.nix b/systems/ll-latitude-e5591/configuration.nix index 1209cf0..dbb5d50 100644 --- a/systems/ll-latitude-e5591/configuration.nix +++ b/systems/ll-latitude-e5591/configuration.nix @@ -1,6 +1,13 @@ # sudo nix run 'github:nix-community/disko/latest#disko-install' -- --flake .#$TARGET_HOSTNAME --disk nvme0n1 /dev/nvme0n1 # tar -xvf /Parlor/Lauren/mlaga97-nixos.tar.zst; sudo nixos-rebuild switch --flake mlaga97-nixos?submodules=1#$HOSTNAME { config, pkgs, ... }: { + # System Info: + # - Model: Dell Latitude 5591 + # - CPU: Intel Core i7-8850H (6C/12T, Passmark: 2369/10147) + # - RAM: 32GB + # - Storage: + # - Toshiba KXG60ZNV512G 512GB NVMe SSD + imports = [ # Core Features ../../nixos/features/base.nix diff --git a/users/lauren_lagarde/system-managed-home.nix b/users/lauren_lagarde/system-managed-home.nix new file mode 100644 index 0000000..3f7e851 --- /dev/null +++ b/users/lauren_lagarde/system-managed-home.nix @@ -0,0 +1,6 @@ +{ ... }: { + home-manager.users."lauren_lagarde" = { + nixpkgs.config.allowUnfree = true; + imports = self.homeManagerModules."lauren_lagarde"; + }; +}