diff --git a/base-system/desktop-config.nix b/base-system/desktop-config.nix
index 3f35bc9..a5847c7 100644
--- a/base-system/desktop-config.nix
+++ b/base-system/desktop-config.nix
@@ -8,6 +8,7 @@
   imports =
     [ # Include the results of the hardware scan.
       ./desktop-hardware-config.nix
+      ./env.nix
     ];
 
   # Enable nix flakes
@@ -117,7 +118,7 @@
     isNormalUser = true;
     description = "twoneis";
     extraGroups = [ "networkmanager" "wheel" ];
-    packages = import ./user-core-packages.nix pkgs ++ import ./user-game-packages.nix pkgs;
+    packages = import ./packages/user-core-packages.nix pkgs ++ import ./packages/user-game-packages.nix pkgs;
   };
 
   # Allow unfree packages
@@ -125,7 +126,7 @@
 
   # List packages installed in system profile. To search, run:
   # $ nix search wget
-  environment.systemPackages = import ./system-packages.nix pkgs;
+  environment.systemPackages = import ./packages/system-packages.nix pkgs;
 
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
diff --git a/base-system/env.nix b/base-system/env.nix
new file mode 100644
index 0000000..99a2d23
--- /dev/null
+++ b/base-system/env.nix
@@ -0,0 +1,9 @@
+{ ... }:
+
+{
+  environment.sessionVariables = {
+    EDITOR = "hx";
+    SUDO_EDITOR = "hx";
+    VISUAL = "hx";
+  };
+}
diff --git a/base-system/home.nix b/base-system/home.nix
index 747b6db..7ece974 100644
--- a/base-system/home.nix
+++ b/base-system/home.nix
@@ -5,12 +5,6 @@
   home.username = "twoneis";
   home.homeDirectory = "/home/twoneis";
 
-  systemd.user.sessionVariables = {
-    EDITOR = "hx";
-    SUDO_EDITOR = "hx";
-    VISUAL = "hx";
-  };
-
   programs = {
     home-manager = {
       enable = true;
diff --git a/base-system/system-packages.nix b/base-system/packages/system-packages.nix
similarity index 100%
rename from base-system/system-packages.nix
rename to base-system/packages/system-packages.nix
diff --git a/base-system/user-core-packages.nix b/base-system/packages/user-core-packages.nix
similarity index 100%
rename from base-system/user-core-packages.nix
rename to base-system/packages/user-core-packages.nix
diff --git a/base-system/user-game-packages.nix b/base-system/packages/user-game-packages.nix
similarity index 100%
rename from base-system/user-game-packages.nix
rename to base-system/packages/user-game-packages.nix
diff --git a/base-system/surface-config.nix b/base-system/surface-config.nix
index aa47239..96bdd8b 100644
--- a/base-system/surface-config.nix
+++ b/base-system/surface-config.nix
@@ -8,6 +8,7 @@
   imports =
     [ # Include the results of the hardware scan.
       ./surface-hardware-config.nix
+      ./env.nix
     ];
 
   # Enable nix flakes
@@ -105,7 +106,7 @@
     isNormalUser = true;
     description = "twoneis";
     extraGroups = [ "networkmanager" "wheel" ];
-    packages = import ./user-core-packages.nix pkgs;
+    packages = import ./packages/user-core-packages.nix pkgs;
   };
 
   # Allow unfree packages
@@ -113,7 +114,7 @@
 
   # List packages installed in system profile. To search, run:
   # $ nix search wget
-  environment.systemPackages = import ./system-packages.nix pkgs;
+  environment.systemPackages = import ./packages/system-packages.nix pkgs;
 
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.