diff --git a/provision/flake.nix b/provision/flake.nix
index 38599bfb..9316fc21 100644
--- a/provision/flake.nix
+++ b/provision/flake.nix
@@ -33,9 +33,10 @@
         inherit system;
         specialArgs = { inherit user; inherit inputs; };
         modules = [
-          ./modules
+          ./hosts/default.nix
           ./hosts/kestrel/configuration.nix
           ./hosts/kestrel/hardware.nix
+          ./modules
           agenix.nixosModules.default
           home-manager.nixosModules.home-manager {
             home-manager.useGlobalPkgs = true;
@@ -44,7 +45,6 @@
             home-manager.users.${user} = {
               imports = [ 
                 ./home-modules
-                ./hosts/kestrel/home-configuration.nix 
               ];
             };
           }
@@ -55,9 +55,10 @@
         inherit system;
         specialArgs = { inherit user; inherit inputs; };
         modules = [
-          ./modules
+          ./hosts/default.nix
           ./hosts/shivan/configuration.nix
           ./hosts/shivan/hardware.nix
+          ./modules
           agenix.nixosModules.default
           home-manager.nixosModules.home-manager {
             home-manager.useGlobalPkgs = true;
@@ -66,7 +67,6 @@
             home-manager.users.${user} = {
               imports = [ 
                 ./home-modules
-                ./hosts/shivan/home-configuration.nix 
               ];
             };
           }
@@ -77,9 +77,10 @@
         inherit system;
         specialArgs = { inherit user; inherit inputs; };
         modules = [
-          ./modules
+          ./hosts/default.nix
           ./hosts/torus/configuration.nix
           ./hosts/torus/hardware.nix
+          ./modules
           agenix.nixosModules.default
           home-manager.nixosModules.home-manager {
             home-manager.useGlobalPkgs = true;
@@ -88,7 +89,6 @@
             home-manager.users.${user} = {
               imports = [ 
                 ./home-modules
-                ./hosts/torus/home-configuration.nix 
               ];
             };
           }
@@ -99,9 +99,10 @@
         inherit system;
         specialArgs = { inherit user; inherit inputs; inherit jovian-nixos; inherit home-manager; };
         modules = [
-          ./modules
+          ./hosts/default.nix
           ./hosts/bulwark/configuration.nix
           ./hosts/bulwark/hardware.nix
+          ./modules
           agenix.nixosModules.default
           home-manager.nixosModules.home-manager {
             home-manager.useGlobalPkgs = true;
@@ -110,7 +111,6 @@
             home-manager.users.${user} = {
               imports = [ 
                 ./home-modules
-                ./hosts/bulwark/home-configuration.nix 
               ];
             };
           }
diff --git a/provision/hosts/bulwark/configuration.nix b/provision/hosts/bulwark/configuration.nix
index aece6783..4cf2a516 100644
--- a/provision/hosts/bulwark/configuration.nix
+++ b/provision/hosts/bulwark/configuration.nix
@@ -103,6 +103,15 @@
     };
   };
 
+  # Home manager modules
+  home-manager.users.${user} = {
+    modules = {
+      desktop = {
+        kitty.enable = true;
+      };
+    };
+  };
+
   # Did you read the comment?
   system.stateVersion = "23.11"; 
 }
diff --git a/provision/hosts/bulwark/home-configuration.nix b/provision/hosts/bulwark/home-configuration.nix
deleted file mode 100644
index 75c59a67..00000000
--- a/provision/hosts/bulwark/home-configuration.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ config, pkgs, user, ... }:
-{
-  home.username = "${user}";
-  home.homeDirectory = "/home/${user}";
-  programs.home-manager.enable = true;
-
-  # Setup git
-  programs.git = {
-      enable = true;
-      userName = "starr-dusT";
-      userEmail = "starrtyler88@gmail.com";
-  };
-
-  home.packages = with pkgs; [
-  ];
-
-  # Enable home modules
-  #modules = {
-  #};
-
-  home.stateVersion = "23.11";
-}
diff --git a/provision/hosts/default.nix b/provision/hosts/default.nix
new file mode 100644
index 00000000..33c8c12a
--- /dev/null
+++ b/provision/hosts/default.nix
@@ -0,0 +1,4 @@
+{ ... }:
+{
+  imports = [ ./default ];
+}
diff --git a/provision/hosts/default/default.nix b/provision/hosts/default/default.nix
new file mode 100644
index 00000000..52f8ba6d
--- /dev/null
+++ b/provision/hosts/default/default.nix
@@ -0,0 +1,4 @@
+{ ... }:
+{ 
+  imports = [ ./home-configuration.nix ];
+}
diff --git a/provision/hosts/default/home-configuration.nix b/provision/hosts/default/home-configuration.nix
new file mode 100644
index 00000000..2d605666
--- /dev/null
+++ b/provision/hosts/default/home-configuration.nix
@@ -0,0 +1,20 @@
+{ config, pkgs, user, ... }:
+{
+  home-manager.users.${user} = {
+    home.username = "${user}";
+    home.homeDirectory = "/home/${user}";
+    programs.home-manager.enable = true;
+
+    programs.direnv = {
+      enable = true;
+      enableBashIntegration = true;
+      nix-direnv.enable = true;
+    };
+
+    home.packages = with pkgs; [
+    ];
+
+    # Did you read the comment?
+    home.stateVersion = "23.11";
+  };
+}
diff --git a/provision/hosts/kestrel/configuration.nix b/provision/hosts/kestrel/configuration.nix
index 4a48460d..dbdf43bd 100644
--- a/provision/hosts/kestrel/configuration.nix
+++ b/provision/hosts/kestrel/configuration.nix
@@ -74,7 +74,7 @@
   # host secrets
   age.secrets."wireguard/kestrel".file = ../../secrets/wireguard/kestrel.age;
 
-  # Enable modules
+  # System modules
   modules = {
     desktop = {
       sway.enable = false;
@@ -116,6 +116,15 @@
     };
   };
 
+  # Home manager modules
+  home-manager.users.${user} = {
+    modules = {
+      desktop = {
+        kitty.enable = true;
+      };
+    };
+  };
+
   # Did you read the comment?
   system.stateVersion = "23.11";
 }
diff --git a/provision/hosts/kestrel/home-configuration.nix b/provision/hosts/kestrel/home-configuration.nix
deleted file mode 100644
index 6ab1009f..00000000
--- a/provision/hosts/kestrel/home-configuration.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ config, pkgs, user, ... }:
-{
-  home.username = "${user}";
-  home.homeDirectory = "/home/${user}";
-  programs.home-manager.enable = true;
-
-  # Setup direnv
-  programs.direnv = {
-    enable = true;
-    enableBashIntegration = true;
-    nix-direnv.enable = true;
-  };
-
-  # Setup git
-  programs.git = {
-    enable = true;
-    userName = "starr-dusT";
-    userEmail = "starrtyler88@gmail.com";
-  };
-
-  home.packages = with pkgs; [
-  ];
-
-  # Enable home modules
-  modules = {
-    desktop = {
-      kitty.enable = true;
-    };
-  };
-
-  home.stateVersion = "23.11";
-}
diff --git a/provision/hosts/shivan/configuration.nix b/provision/hosts/shivan/configuration.nix
index 448a990a..c64b2d0c 100644
--- a/provision/hosts/shivan/configuration.nix
+++ b/provision/hosts/shivan/configuration.nix
@@ -108,6 +108,24 @@
     };
   };
 
+  # Home manager modules
+  home-manager.users.${user} = {
+    modules = {
+      desktop = {
+        kitty.enable = true;
+      };
+    };
+  };
+
+  # Home manager modules
+  home-manager.users.${user} = {
+    modules = {
+      desktop = {
+        kitty.enable = true;
+      };
+    };
+  };
+
   # Did you read the comment?
   system.stateVersion = "23.11";
 }
diff --git a/provision/hosts/shivan/home-configuration.nix b/provision/hosts/shivan/home-configuration.nix
deleted file mode 100644
index 6ab1009f..00000000
--- a/provision/hosts/shivan/home-configuration.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ config, pkgs, user, ... }:
-{
-  home.username = "${user}";
-  home.homeDirectory = "/home/${user}";
-  programs.home-manager.enable = true;
-
-  # Setup direnv
-  programs.direnv = {
-    enable = true;
-    enableBashIntegration = true;
-    nix-direnv.enable = true;
-  };
-
-  # Setup git
-  programs.git = {
-    enable = true;
-    userName = "starr-dusT";
-    userEmail = "starrtyler88@gmail.com";
-  };
-
-  home.packages = with pkgs; [
-  ];
-
-  # Enable home modules
-  modules = {
-    desktop = {
-      kitty.enable = true;
-    };
-  };
-
-  home.stateVersion = "23.11";
-}
diff --git a/provision/hosts/torus/configuration.nix b/provision/hosts/torus/configuration.nix
index 63c008bd..065378e6 100644
--- a/provision/hosts/torus/configuration.nix
+++ b/provision/hosts/torus/configuration.nix
@@ -147,6 +147,16 @@
       secrets.enable = true;
     };
   };
+
+  # Home manager modules
+  home-manager.users.${user} = {
+    modules = {
+      desktop = {
+        kitty.enable = false;
+      };
+    };
+  };
+
   # Did you read the comment?
   system.stateVersion = "23.11";
 }
diff --git a/provision/hosts/torus/home-configuration.nix b/provision/hosts/torus/home-configuration.nix
deleted file mode 100644
index 9d1a125d..00000000
--- a/provision/hosts/torus/home-configuration.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ config, pkgs, user, ... }:
-{
-  home.username = "${user}";
-  home.homeDirectory = "/home/${user}";
-  programs.home-manager.enable = true;
-
-  home.packages = with pkgs; [
-    chezmoi
-    rbw 
-  ];
-
-  # Enable home modules
-  #modules = {
-  #};
-
-  home.stateVersion = "23.11";
-}