diff --git a/system/home/emacs/default.nix b/system/home/emacs/default.nix
index 73c606a2..df66f550 100644
--- a/system/home/emacs/default.nix
+++ b/system/home/emacs/default.nix
@@ -1,6 +1,4 @@
 {
-  config,
-  lib,
   pkgs,
   ...
 }:
@@ -12,13 +10,7 @@
     ../texlive/default.nix
     ../programming/default.nix
   ];
-  services.emacs = {
-    enable = lib.mkDefault true;
-    package = config.programs.emacs.finalPackage;
-    defaultEditor = true;
-    client.enable = true;
-    socketActivation.enable = true;
-  };
+  home.sessionVariables.EDITOR = "emacs";
   programs.emacs = {
     enable = true;
     package = pkgs.emacs30.override {
diff --git a/system/home/hyprland.nix b/system/home/hyprland.nix
index c14a2e99..0d73d982 100644
--- a/system/home/hyprland.nix
+++ b/system/home/hyprland.nix
@@ -351,7 +351,7 @@
           # Common program shortcuts
           "SUPER, D, exec, ${config.programs.fuzzel.package}/bin/fuzzel"
           "SUPER, C, exec, ${config.programs.alacritty.package}/bin/alacritty"
-          "SUPER, E, exec, ${config.programs.emacs.finalPackage}/bin/emacsclient -c"
+          "SUPER, E, exec, ${config.programs.emacs.finalPackage}/bin/emacs"
           "SUPER, W, exec, ${pkgs.nyxt}/bin/nyxt --no-socket"
           "SUPER, F, exec, ${pkgs.nautilus}/bin/nautilus"