diff --git a/modules/home/all/himalaya.nix b/modules/home/all/email/default.nix
similarity index 62%
rename from modules/home/all/himalaya.nix
rename to modules/home/all/email/default.nix
index a8e10ed..d8f810a 100644
--- a/modules/home/all/himalaya.nix
+++ b/modules/home/all/email/default.nix
@@ -13,17 +13,9 @@ let
   };
 in
 {
-  home.shellAliases = {
-    H = "himalaya";
-    Hr = "himalaya message read";
-    Hd = "himalaya message delete";
-    Hs = "himalaya account sync";
-  };
-
-  programs.himalaya = {
-    enable = true;
-  };
-
+  imports = [
+    ./himalaya.nix
+  ];
   accounts.email.accounts = {
     "srid@srid.ca" = iCloudMailSettings // {
       primary = true;
@@ -32,13 +24,6 @@ in
       aliases = [ "srid@srid.ca" ];
       userName = "happyandharmless";
       passwordCommand = "op read op://Personal/iCloud-Apple/himalaya";
-      himalaya = {
-        enable = true;
-        # Don't forget to run `himalaya account sync` first!
-        settings.sync = {
-          enable = true;
-        };
-      };
     };
   };
 }
diff --git a/modules/home/all/email/himalaya.nix b/modules/home/all/email/himalaya.nix
new file mode 100644
index 0000000..865f8ec
--- /dev/null
+++ b/modules/home/all/email/himalaya.nix
@@ -0,0 +1,24 @@
+{
+  home.shellAliases = {
+    H = "himalaya";
+    Hr = "himalaya message read";
+    Hd = "himalaya message delete";
+    Hs = "himalaya account sync";
+  };
+
+  programs.himalaya = {
+    enable = true;
+  };
+
+  accounts.email.accounts = {
+    "srid@srid.ca" = {
+      himalaya = {
+        enable = true;
+        # Don't forget to run `himalaya account sync` first!
+        settings.sync = {
+          enable = true;
+        };
+      };
+    };
+  };
+}
diff --git a/modules/home/darwin-only.nix b/modules/home/darwin-only.nix
index 012d4ee..e3463ee 100644
--- a/modules/home/darwin-only.nix
+++ b/modules/home/darwin-only.nix
@@ -2,7 +2,7 @@
   imports = [
     ./all/zsh.nix
     ./all/wezterm
-    ./all/himalaya.nix
+    ./all/email
     ./all/_1password.nix
     ./all/emacs.nix
   ];