remove unneeded packages + refactor more

5 files changed, 1 insertions, 27 deletions

diff --git a/flake.nix b/flake.nix
index d73b3a8..458aaab 100644
--- a/flake.nix
+++ b/flake.nix
@@ -33,8 +33,6 @@
 				name = "glados";
 				modules = [
 					lanzaboote.nixosModules.lanzaboote
-
-					./hosts/glados
 					./users/seth
 				];
 				version = "23.05";
@@ -55,8 +53,6 @@
 							interop.includePath = false;
 						};
 					})
-
-					./hosts/glados-wsl
 					./users/seth
 				];
 				pkgs = nixpkgs;
diff --git a/hosts/common/packages.nix b/hosts/common/packages.nix
index 8e08740..0cf093c 100644
--- a/hosts/common/packages.nix
+++ b/hosts/common/packages.nix
@@ -12,7 +12,6 @@ in {
 		[
 			git
 			neofetch
-			nixos-option
 			pinentry-curses
 			python310
 			vim
diff --git a/hosts/glados/default.nix b/hosts/glados/default.nix
index 065b576..3e42bf9 100644
--- a/hosts/glados/default.nix
+++ b/hosts/glados/default.nix
@@ -1,11 +1,9 @@
 _: {
 	imports = [
-		../common/desktop/gnome.nix
 		../common/hardware/nvidia.nix
 		./boot.nix
 		./hardware-configuration.nix
 		./network.nix
-		./packages.nix
 		./services.nix
 	];
 
diff --git a/hosts/glados/packages.nix b/hosts/glados/packages.nix
deleted file mode 100644
index 7066911..0000000
--- a/hosts/glados/packages.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{pkgs, ...}: {
-	environment.systemPackages = with pkgs; [
-		git
-		gnupg1
-		neofetch
-		nixos-option
-		pinentry-curses
-		python310
-		vim
-	];
-
-	programs = {
-		gnupg = {
-			agent = {
-				enable = true;
-				pinentryFlavor = "curses";
-			};
-		};
-	};
-}
diff --git a/util/host.nix b/util/host.nix
index 8c3ab91..637f0f3 100644
--- a/util/host.nix
+++ b/util/host.nix
@@ -12,6 +12,7 @@
 				modules =
 					[
 						../hosts/common
+						../hosts/${name}
 
 						({pkgs, ...}: {
 							system.stateVersion = version;