diff --git a/modules/universal/env/default.nix b/modules/universal/env/default.nix
index 0700b38fe..449877828 100644
--- a/modules/universal/env/default.nix
+++ b/modules/universal/env/default.nix
@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ./home-manager.nix
+    ./home-manager
     ./home-packages.nix
     ./system-packages.nix
   ];
diff --git a/modules/universal/env/home-manager.nix b/modules/universal/env/home-manager/default.nix
similarity index 92%
rename from modules/universal/env/home-manager.nix
rename to modules/universal/env/home-manager/default.nix
index ecd3b8ea8..9e33a016a 100644
--- a/modules/universal/env/home-manager.nix
+++ b/modules/universal/env/home-manager/default.nix
@@ -20,6 +20,10 @@ let
   feeds = import ./feeds.nix { inherit lib; };
 in
 {
+  imports = [
+    ./zsh.nix
+  ];
+
   options = {
     # packages to deploy to the user's home
     sane.home-manager.extraPackages = mkOption {
@@ -45,12 +49,12 @@ in
   config = {
     sops.secrets."aerc_accounts" = {
       owner = config.users.users.colin.name;
-      sopsFile = ../../../secrets/universal/aerc_accounts.conf;
+      sopsFile = ../../../../secrets/universal/aerc_accounts.conf;
       format = "binary";
     };
     sops.secrets."sublime_music_config" = {
       owner = config.users.users.colin.name;
-      sopsFile = ../../../secrets/universal/sublime_music_config.json.bin;
+      sopsFile = ../../../../secrets/universal/sublime_music_config.json.bin;
       format = "binary";
     };
 
@@ -91,7 +95,7 @@ in
         initKeyring = {
           after = ["writeBoundary"];
           before = [];
-          data = "${../../../scripts/init-keyring}";
+          data = "${../../../../scripts/init-keyring}";
         };
       };
 
@@ -259,51 +263,6 @@ in
       programs = {
         home-manager.enable = true;  # this lets home-manager manage dot-files in user dirs, i think
 
-        zsh = {
-          enable = true;
-          enableSyntaxHighlighting = true;
-          enableVteIntegration = true;
-          history.ignorePatterns = [ "rm *" ];
-          # history.path = TODO
-          dotDir = ".config/zsh";
-
-          initExtraBeforeCompInit = ''
-            # p10k instant prompt
-            # run p10k configure to configure, but it can't write out its file :-(
-            POWERLEVEL9K_DISABLE_CONFIGURATION_WIZARD=true
-          '';
-          initExtra = ''
-            # zmv is a way to do rich moves/renames, with pattern matching/substitution.
-            # see for an example: <https://filipe.kiss.ink/zmv-zsh-rename/>
-            autoload -Uz zmv
-
-            function nd() {
-              mkdir -p "$1";
-              pushd "$1";
-            }
-          '';
-
-          # prezto = oh-my-zsh fork; controls prompt, auto-completion, etc.
-          # see: https://github.com/sorin-ionescu/prezto
-          prezto = {
-            enable = true;
-            pmodules = [
-              "environment"
-              "terminal"
-              "editor"
-              "history"
-              "directory"
-              "spectrum"
-              "utility"
-              "completion"
-              "prompt"
-              "git"
-            ];
-            prompt = {
-              theme = "powerlevel10k";
-            };
-          };
-        };
 
         kitty = {
           enable = true;
@@ -516,13 +475,6 @@ in
         # "command not found" will cause the command to be searched in nixpkgs
         nix-index.enable = true;
       } // cfg.programs;
-
-      home.shellAliases = {
-        ":q" = "exit";
-        # common typos
-        "cd.." = "cd ..";
-        "cd../" = "cd ../";
-      };
     };
   };
 }
diff --git a/modules/universal/env/feeds.nix b/modules/universal/env/home-manager/feeds.nix
similarity index 100%
rename from modules/universal/env/feeds.nix
rename to modules/universal/env/home-manager/feeds.nix
diff --git a/modules/universal/env/web-browser.nix b/modules/universal/env/home-manager/web-browser.nix
similarity index 100%
rename from modules/universal/env/web-browser.nix
rename to modules/universal/env/home-manager/web-browser.nix
diff --git a/modules/universal/env/home-manager/zsh.nix b/modules/universal/env/home-manager/zsh.nix
new file mode 100644
index 000000000..85c108a99
--- /dev/null
+++ b/modules/universal/env/home-manager/zsh.nix
@@ -0,0 +1,55 @@
+{ ... }:
+{
+  home-manager.users.colin.programs.zsh = {
+    enable = true;
+    enableSyntaxHighlighting = true;
+    enableVteIntegration = true;
+    history.ignorePatterns = [ "rm *" ];
+    # history.path = TODO
+    dotDir = ".config/zsh";
+
+    initExtraBeforeCompInit = ''
+      # p10k instant prompt
+      # run p10k configure to configure, but it can't write out its file :-(
+      POWERLEVEL9K_DISABLE_CONFIGURATION_WIZARD=true
+    '';
+    initExtra = ''
+      # zmv is a way to do rich moves/renames, with pattern matching/substitution.
+      # see for an example: <https://filipe.kiss.ink/zmv-zsh-rename/>
+      autoload -Uz zmv
+
+      function nd() {
+        mkdir -p "$1";
+        pushd "$1";
+      }
+    '';
+
+    # prezto = oh-my-zsh fork; controls prompt, auto-completion, etc.
+    # see: https://github.com/sorin-ionescu/prezto
+    prezto = {
+      enable = true;
+      pmodules = [
+        "environment"
+        "terminal"
+        "editor"
+        "history"
+        "directory"
+        "spectrum"
+        "utility"
+        "completion"
+        "prompt"
+        "git"
+      ];
+      prompt = {
+        theme = "powerlevel10k";
+      };
+    };
+  };
+
+  home-manager.users.colin.home.shellAliases = {
+    ":q" = "exit";
+    # common typos
+    "cd.." = "cd ..";
+    "cd../" = "cd ../";
+  };
+}