diff --git a/modules/desktop-software.nix b/modules/desktop-software.nix
index 1a651f7..24359a9 100644
--- a/modules/desktop-software.nix
+++ b/modules/desktop-software.nix
@@ -21,6 +21,8 @@
     obs-studio
     firefox
     lapce
+    spotify
+    ghostty
   ];
   programs.steam.enable = true;
 }
diff --git a/modules/emacs.nix b/modules/emacs.nix
index b48a977..d4b0f26 100644
--- a/modules/emacs.nix
+++ b/modules/emacs.nix
@@ -32,6 +32,6 @@
           ]
         )
       );
-    defaultEditor = lib.mkForce false;
+    defaultEditor = lib.mkForce true;
   };
 }
diff --git a/modules/gnome.nix b/modules/gnome.nix
index b1dae16..08c3b84 100644
--- a/modules/gnome.nix
+++ b/modules/gnome.nix
@@ -16,8 +16,6 @@
     qbittorrent
     gnomeExtensions.caffeine
     gnomeExtensions.brightness-control-using-ddcutil
-    spotify
-    ghostty
     fractal
   ];