users/richie/home/global.nix

@@ -1,22 +1,7 @@
-{ config, ... }:
 {
   imports = [
-    ./cli
+    ./minimal.nix
     ./programs.nix
     ./ssh_config.nix
   ];
-
-  programs = {
-    home-manager.enable = true;
-    git.enable = true;
-  };
-
-  home = {
-    username = "richie";
-    homeDirectory = "/home/${config.home.username}";
-    stateVersion = "24.05";
-    sessionVariables = {
-      FLAKE = "$HOME/dotfiles";
-    };
-  };
 }

users/richie/home/minimal.nix

@@ -0,0 +1,17 @@
+{ config, ... }:
+{
+  imports = [
+    ./cli
+  ];
+
+  programs = {
+    home-manager.enable = true;
+  };
+
+  home = {
+    username = "richie";
+    homeDirectory = "/home/${config.home.username}";
+    stateVersion = "24.05";
+    sessionVariables.FLAKE = "$HOME/dotfiles";
+  };
+}