diff --git a/system/Legion.nix b/system/Legion.nix
index c10dda5f..9343dcb8 100644
--- a/system/Legion.nix
+++ b/system/Legion.nix
@@ -17,6 +17,7 @@
     efi.canTouchEfiVariables = true;
   };
   home-manager.users.${username} = {
+    imports = [ ./home/emacs/default.nix ];
     home.stateVersion = "23.05";
   };
   system.stateVersion = "23.05";
diff --git a/system/default.nix b/system/default.nix
index 1b6bca5c..739f23cc 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -136,8 +136,6 @@
       imports = [
         ./home/shell/default.nix
         ./home/scripts/default.nix
-        ./home/password-store/default.nix
-        ./home/emacs/default.nix
       ];
       home = {
         inherit username;
diff --git a/system/desktop.nix b/system/desktop.nix
index 93035aad..431f71a5 100644
--- a/system/desktop.nix
+++ b/system/desktop.nix
@@ -124,8 +124,10 @@
         ./home/hyprland.nix
         ./home/terminal/default.nix
         ./home/browser/firefox.nix
+        ./home/emacs/default.nix
         ./home/email/default.nix
         ./home/calendar/default.nix
+        ./home/password-store/default.nix
       ];
       home.file.${config.gtk.gtk2.configLocation}.force = true;
       services = {