diff --git a/flake.nix b/flake.nix index d123ebb..8c86ce7 100644 --- a/flake.nix +++ b/flake.nix @@ -74,6 +74,8 @@ { home.username = "lauren_lagarde"; home.homeDirectory = "/home/lauren_lagarde"; + + nixpkgs.config.allowUnfree = true; } ./home-manager/base.nix @@ -149,9 +151,12 @@ modules = [ { networking.hostName = "living-room"; - system.stateVersion = "25.05"; - home-manager.users."lauren_lagarde".home.stateVersion = "25.05"; + + home-manager.users."lauren_lagarde" = { + home.stateVersion = "25.05"; + imports = self.homeManagerModules."lauren_lagarde@living-room"; + }; time.timeZone = "America/Chicago"; sops.defaultSopsFile = ./secrets.yaml; @@ -173,9 +178,12 @@ { networking.hostName = "bastion"; networking.hostId = "0d13f99b"; - system.stateVersion = "24.11"; - home-manager.users."lauren_lagarde".home.stateVersion = "24.11"; + + home-manager.users."lauren_lagarde" = { + home.stateVersion = "24.11"; + imports = self.homeManagerModules."lauren_lagarde"; + }; time.timeZone = "America/Chicago"; sops.defaultSopsFile = ./secrets.yaml; @@ -197,9 +205,12 @@ { networking.hostName = "blockhouse"; networking.hostId = "ed658529"; - system.stateVersion = "23.11"; - home-manager.users."lauren_lagarde".home.stateVersion = "24.11"; + + home-manager.users."lauren_lagarde" = { + home.stateVersion = "24.11"; + imports = self.homeManagerModules."lauren_lagarde"; + }; time.timeZone = "America/Chicago"; sops.defaultSopsFile = ./secrets.yaml; diff --git a/systems/bastion/configuration.nix b/systems/bastion/configuration.nix index 43f9990..2d421ee 100644 --- a/systems/bastion/configuration.nix +++ b/systems/bastion/configuration.nix @@ -30,7 +30,6 @@ # 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 11d9187..c5bd11b 100755 --- a/systems/blockhouse/configuration.nix +++ b/systems/blockhouse/configuration.nix @@ -24,7 +24,6 @@ # 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 5a05bb9..966211b 100644 --- a/systems/living-room/configuration.nix +++ b/systems/living-room/configuration.nix @@ -21,7 +21,6 @@ # Users ../../users/lauren_lagarde/autologin.nix ../../users/lauren_lagarde/lauren_lagarde.nix - ../../users/lauren_lagarde/system-managed-home.nix # i3wm ../../nixos/features/i3wm.nix diff --git a/users/lauren_lagarde/system-managed-home.nix b/users/lauren_lagarde/system-managed-home.nix deleted file mode 100644 index 3f7e851..0000000 --- a/users/lauren_lagarde/system-managed-home.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ ... }: { - home-manager.users."lauren_lagarde" = { - nixpkgs.config.allowUnfree = true; - imports = self.homeManagerModules."lauren_lagarde"; - }; -}