diff --git a/modules/home/letta-agent.nix b/modules/home/letta-agent.nix
index 0918714..9ac7165 100644
--- a/modules/home/letta-agent.nix
+++ b/modules/home/letta-agent.nix
@@ -1,5 +1,5 @@
 # Home config for a letta agent user, parameterized by agent name.
-# Mirrors modules/home/puregarlic/vcs.nix, but with the agent's own
+# Mirrors modules/home/puregarlic/server/vcs.nix, but with the agent's own
 # signing and forge-auth keys. Agents commit under Graham's email by
 # default; with a did set, the agent commits (git and jj) as the DID
 # and signatures attribute to them. With forgeIdentity = false the
diff --git a/modules/home/puregarlic/default.nix b/modules/home/puregarlic/default.nix
index b856ee8..24de57e 100644
--- a/modules/home/puregarlic/default.nix
+++ b/modules/home/puregarlic/default.nix
@@ -3,11 +3,9 @@
   imports = [
     ./nushell.nix
     ./helix.nix
-    ./vcs.nix
     ./tuicr.nix
   ];
 
   home.username = "puregarlic";
   home.homeDirectory = "/home/puregarlic";
-  home.stateVersion = "26.05";
 }
diff --git a/modules/home/puregarlic/desktop/default.nix b/modules/home/puregarlic/desktop/default.nix
index a67419f..233c312 100644
--- a/modules/home/puregarlic/desktop/default.nix
+++ b/modules/home/puregarlic/desktop/default.nix
@@ -1,12 +1,10 @@
 { inputs, pkgs, ... }:
 {
   imports = [
-    ../nushell.nix
-    ../helix.nix
+    ../default.nix
     ./niri.nix
     ./noctalia.nix
     ./vcs.nix
-    ../tuicr.nix
     ./wallpapers.nix
     ./zen.nix
   ];
@@ -68,7 +66,5 @@
     };
   };
 
-  home.username = "puregarlic";
-  home.homeDirectory = "/home/puregarlic";
   home.stateVersion = "25.11";
 }
diff --git a/modules/home/puregarlic/server/default.nix b/modules/home/puregarlic/server/default.nix
new file mode 100644
index 0000000..d1ce248
--- /dev/null
+++ b/modules/home/puregarlic/server/default.nix
@@ -0,0 +1,9 @@
+{ ... }:
+{
+  imports = [
+    ../default.nix
+    ./vcs.nix
+  ];
+
+  home.stateVersion = "26.05";
+}
diff --git a/modules/home/puregarlic/vcs.nix b/modules/home/puregarlic/server/vcs.nix
similarity index 96%
rename from modules/home/puregarlic/vcs.nix
rename to modules/home/puregarlic/server/vcs.nix
index ddf4927..6ed86dc 100644
--- a/modules/home/puregarlic/vcs.nix
+++ b/modules/home/puregarlic/server/vcs.nix
@@ -12,7 +12,7 @@ let
   # agent's DID. See modules/keys/allowed-signers.nix.
   allowedSigners = pkgs.writeText "allowed-signers"
     (lib.concatMapStrings (l: l + "\n")
-      (import ../../keys/allowed-signers.nix).lines);
+      (import ../../../keys/allowed-signers.nix).lines);
 in {
   programs.git = {
     enable = true;
diff --git a/modules/nixos/users/puregarlic.nix b/modules/nixos/users/puregarlic.nix
index 420112d..f14816c 100644
--- a/modules/nixos/users/puregarlic.nix
+++ b/modules/nixos/users/puregarlic.nix
@@ -26,5 +26,5 @@
     ];
   };
 
-  home-manager.users.puregarlic = import ../../home/puregarlic;
+  home-manager.users.puregarlic = import ../../home/puregarlic/server;
 }