diff --git a/modules/universal/default.nix b/modules/universal/default.nix
index 32b245635..40e276de4 100644
--- a/modules/universal/default.nix
+++ b/modules/universal/default.nix
@@ -2,10 +2,9 @@
 
 {
   imports = [
+    ./env
     ./fs.nix
-    ./home-manager.nix
     ./secrets.nix
-    ./users.nix
     ./vpn.nix
   ];
 
@@ -23,13 +22,6 @@
     };
   };
 
-  # programs.vim.defaultEditor = true;
-  environment.variables = {
-    EDITOR = "vim";
-    # git claims it should use EDITOR, but it doesn't!
-    GIT_EDITOR = "vim";
-  };
-
   # allow `nix flake ...` command
   nix.extraOptions = ''
     experimental-features = nix-command flakes
diff --git a/modules/universal/env/default.nix b/modules/universal/env/default.nix
new file mode 100644
index 000000000..3c2ac34ca
--- /dev/null
+++ b/modules/universal/env/default.nix
@@ -0,0 +1,16 @@
+{ ... }:
+
+{
+  imports = [
+    ./users.nix
+    ./home-manager.nix
+  ];
+
+  # programs.vim.defaultEditor = true;
+  environment.variables = {
+    EDITOR = "vim";
+    # git claims it should use EDITOR, but it doesn't!
+    GIT_EDITOR = "vim";
+  };
+}
+
diff --git a/modules/universal/home-manager.nix b/modules/universal/env/home-manager.nix
similarity index 99%
rename from modules/universal/home-manager.nix
rename to modules/universal/env/home-manager.nix
index 2aa150cef..3658cf3c7 100644
--- a/modules/universal/home-manager.nix
+++ b/modules/universal/env/home-manager.nix
@@ -37,7 +37,7 @@ in
   config = lib.mkIf cfg.enable {
     sops.secrets."aerc_accounts" = {
       owner = config.users.users.colin.name;
-      sopsFile = ../../secrets/universal/aerc_accounts.conf;
+      sopsFile = ../../../secrets/universal/aerc_accounts.conf;
       format = "binary";
     };
 
diff --git a/modules/universal/users.nix b/modules/universal/env/users.nix
similarity index 100%
rename from modules/universal/users.nix
rename to modules/universal/env/users.nix