diff --git a/home/home.nix b/home/home.nix
index 22b6a45..5eb4ad6 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -10,15 +10,7 @@ in
 	imports = [
 		inputs.nixvim.homeManagerModules.default
 		./modules
-		./ansible.nix
-		./bash.nix
-		./direnv.nix
-		./git.nix
-		./ssh.nix
-		./vim.nix
-		./xonsh.nix
-		./hosts/${host}
-	];
+	] ++ lib.optionals (builtins.pathExists ./hosts/${host}) [ ./hosts/${host} ];
 
 
 	programs.tmux = {
diff --git a/home/hosts/genesis/default.nix b/home/hosts/genesis/default.nix
deleted file mode 100644
index d8147ea..0000000
--- a/home/hosts/genesis/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ ... }:
-
-{
-
-}
diff --git a/home/hosts/hosea/default.nix b/home/hosts/hosea/default.nix
deleted file mode 100644
index d8147ea..0000000
--- a/home/hosts/hosea/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ ... }:
-
-{
-
-}
diff --git a/home/hosts/iso/default.nix b/home/hosts/iso/default.nix
deleted file mode 100644
index d8147ea..0000000
--- a/home/hosts/iso/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ ... }:
-
-{
-
-}
diff --git a/home/hosts/jeremiah/default.nix b/home/hosts/jeremiah/default.nix
deleted file mode 100644
index dbaa756..0000000
--- a/home/hosts/jeremiah/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ pkgs, config, ... }:
-
-{
-}
diff --git a/home/hosts/jude/default.nix b/home/hosts/jude/default.nix
index 39c1645..6b06c1b 100644
--- a/home/hosts/jude/default.nix
+++ b/home/hosts/jude/default.nix
@@ -1,16 +1,16 @@
 { pkgs, ... }:
 
 {
-	imports = [
-		../../vscodium.nix
-	];
 	home.packages = with pkgs; [
 		(mumble.override { pulseSupport = true; })
 		logseq
 	];
-	greg.gui = true;
-	greg.sway = false;
-	greg.gnome = false;
+	greg = {
+		gui = true;
+		sway = false;
+		gnome = false;
+		vscodium = true;
+	};
 
 	programs.xonsh.sessionVariables.EFI_DIR = "${pkgs.OVMF.fd}/FV/";
 }
diff --git a/home/hosts/linode/default.nix b/home/hosts/linode/default.nix
deleted file mode 100644
index d8147ea..0000000
--- a/home/hosts/linode/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ ... }:
-
-{
-
-}
diff --git a/home/hosts/ls23003/default.nix b/home/hosts/ls23003/default.nix
deleted file mode 100644
index facb35d..0000000
--- a/home/hosts/ls23003/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ ... }:
-{
-
-}
diff --git a/home/hosts/myself/default.nix b/home/hosts/myself/default.nix
deleted file mode 100644
index 04618ac..0000000
--- a/home/hosts/myself/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ ... }:
-
-{
-}
diff --git a/home/hosts/work/default.nix b/home/hosts/work/default.nix
index 0ba0b6e..f14792d 100644
--- a/home/hosts/work/default.nix
+++ b/home/hosts/work/default.nix
@@ -1,9 +1,7 @@
 { pkgs, ... }:
 
 {
-	imports = [
-		../../vscodium.nix
-	];
+	greg.vscodium.enable = true;
 
 	home.packages = with pkgs; [
 		brew
diff --git a/home/hosts/wsl/default.nix b/home/hosts/wsl/default.nix
deleted file mode 100644
index d8147ea..0000000
--- a/home/hosts/wsl/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ ... }:
-
-{
-
-}
diff --git a/home/ansible.nix b/home/modules/baseline/ansible.nix
similarity index 100%
rename from home/ansible.nix
rename to home/modules/baseline/ansible.nix
diff --git a/home/bash.nix b/home/modules/baseline/bash.nix
similarity index 100%
rename from home/bash.nix
rename to home/modules/baseline/bash.nix
diff --git a/home/modules/baseline/default.nix b/home/modules/baseline/default.nix
new file mode 100644
index 0000000..8eb30b6
--- /dev/null
+++ b/home/modules/baseline/default.nix
@@ -0,0 +1,13 @@
+{ ... }:
+
+{
+	imports = [
+		./ansible.nix
+		./bash.nix
+		./direnv.nix
+		./git.nix
+		./ssh.nix
+		./vim.nix
+		./xonsh.nix
+	];
+}
diff --git a/home/direnv.nix b/home/modules/baseline/direnv.nix
similarity index 100%
rename from home/direnv.nix
rename to home/modules/baseline/direnv.nix
diff --git a/home/git.nix b/home/modules/baseline/git.nix
similarity index 100%
rename from home/git.nix
rename to home/modules/baseline/git.nix
diff --git a/home/ssh.nix b/home/modules/baseline/ssh.nix
similarity index 100%
rename from home/ssh.nix
rename to home/modules/baseline/ssh.nix
diff --git a/home/vim.nix b/home/modules/baseline/vim.nix
similarity index 100%
rename from home/vim.nix
rename to home/modules/baseline/vim.nix
diff --git a/home/vim/extra.lua b/home/modules/baseline/vim/extra.lua
similarity index 100%
rename from home/vim/extra.lua
rename to home/modules/baseline/vim/extra.lua
diff --git a/home/vim/extra.vimrc b/home/modules/baseline/vim/extra.vimrc
similarity index 100%
rename from home/vim/extra.vimrc
rename to home/modules/baseline/vim/extra.vimrc
diff --git a/home/vim/init.lua b/home/modules/baseline/vim/init.lua
similarity index 100%
rename from home/vim/init.lua
rename to home/modules/baseline/vim/init.lua
diff --git a/home/vim/vimrc b/home/modules/baseline/vim/vimrc
similarity index 100%
rename from home/vim/vimrc
rename to home/modules/baseline/vim/vimrc
diff --git a/home/xonsh.nix b/home/modules/baseline/xonsh.nix
similarity index 100%
rename from home/xonsh.nix
rename to home/modules/baseline/xonsh.nix
diff --git a/home/xonsh_footer.xsh b/home/modules/baseline/xonsh_footer.xsh
similarity index 100%
rename from home/xonsh_footer.xsh
rename to home/modules/baseline/xonsh_footer.xsh
diff --git a/home/xonsh_header.xsh b/home/modules/baseline/xonsh_header.xsh
similarity index 100%
rename from home/xonsh_header.xsh
rename to home/modules/baseline/xonsh_header.xsh
diff --git a/home/modules/default.nix b/home/modules/default.nix
index 05e118f..dd181ab 100644
--- a/home/modules/default.nix
+++ b/home/modules/default.nix
@@ -2,10 +2,12 @@
 
 {
 	imports = [
+		./baseline
 		./gnome.nix
 		./gui.nix
 		./python.nix
 		./sway.nix
+		./vscodium.nix
 		./xonsh.nix
 	];
 }
diff --git a/home/modules/vscodium.nix b/home/modules/vscodium.nix
new file mode 100644
index 0000000..563e804
--- /dev/null
+++ b/home/modules/vscodium.nix
@@ -0,0 +1,32 @@
+{ pkgs, config, lib, ... }:
+
+let
+	cfg = config.greg.vscodium;
+in {
+	options.greg.vscodium = lib.mkEnableOption "Enable installation of VSCodium on the host";
+
+	config = lib.mkIf cfg {
+		home.packages = with pkgs; [
+			buildifier
+			gopls
+		];
+
+		# An alternative editor to vim, when I need it for some things
+		programs.vscode = {
+			enable = true;
+			package = pkgs.vscodium;
+			extensions = with pkgs.vscode-extensions; [
+				arrterian.nix-env-selector
+				asvetliakov.vscode-neovim
+				bungcip.better-toml
+				golang.go
+				jnoortheen.nix-ide
+				mkhl.direnv
+				ms-python.python
+				vscjava.vscode-java-test
+				vscjava.vscode-java-dependency
+				vscjava.vscode-java-debug
+			];
+		};
+	};
+}
diff --git a/home/vscodium.nix b/home/vscodium.nix
deleted file mode 100644
index 2f9fed4..0000000
--- a/home/vscodium.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ pkgs, ... }:
-
-{
-	home.packages = with pkgs; [
-		buildifier
-		gopls
-	];
-
-	# An alternative editor to vim, when I need it for some things
-	programs.vscode = {
-		enable = true;
-		package = pkgs.vscodium;
-		extensions = with pkgs.vscode-extensions; [
-			arrterian.nix-env-selector
-			asvetliakov.vscode-neovim
-			bungcip.better-toml
-			golang.go
-			jnoortheen.nix-ide
-			mkhl.direnv
-			ms-python.python
-			vscjava.vscode-java-test
-			vscjava.vscode-java-dependency
-			vscjava.vscode-java-debug
-		];
-	};
-}