diff --git a/flake.nix b/flake.nix
index 472bd537..2ae924ec 100644
--- a/flake.nix
+++ b/flake.nix
@@ -77,7 +77,7 @@
         homeModules = [
           ./home/accounts/service.nix
           ./home/alacritty/default.nix
-          ./home/emacs/server.nix
+          ./home/emacs/default.nix
           ./home/firefox/default.nix
           ./home/git/default.nix
           ./home/hyprland/default.nix
diff --git a/home/emacs/default.nix b/home/emacs/default.nix
index 3ea9d263..52c0badd 100644
--- a/home/emacs/default.nix
+++ b/home/emacs/default.nix
@@ -1,17 +1,10 @@
 { pkgs, inputs, ... }:
-let
-  sessionVariables = {
-    DOOMLOCALDIR = "$HOME/.local/share/doomemacs";
-    DOOMPROFILELOADFILE = "$HOME/.local/share/doomemacs/profiles/load.el";
-  };
-in {
-  imports = [ ../accounts/default.nix ../git/default.nix ];
-  xdg.configFile.emacs.source = inputs.doom-emacs;
-  systemd.user = { inherit sessionVariables; };
+
+{
+  # imports = [ ../accounts/default.nix ../git/default.nix ];
   programs.emacs.enable = true;
   home = {
-    inherit sessionVariables;
-    sessionPath = [ "${inputs.doom-emacs}/bin" ];
+    sessionPath = [ "$HOME/.config/emacs/bin" "$HOME/.emacs.d/bin" ];
     packages = with pkgs; [
       # Emacs dependencies
       ripgrep
diff --git a/home/emacs/server.nix b/home/emacs/server.nix
deleted file mode 100644
index 721db056..00000000
--- a/home/emacs/server.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ config, ... }:
-
-{
-  imports = [ ./default.nix ];
-  services.emacs = {
-    enable = true;
-    package = config.programs.emacs.package;
-    defaultEditor = true;
-    client.enable = true;
-    startWithUserSession = true;
-  };
-}
diff --git a/home/hyprland/config.nix b/home/hyprland/config.nix
index d29ef473..cf3a62da 100644
--- a/home/hyprland/config.nix
+++ b/home/hyprland/config.nix
@@ -85,7 +85,7 @@
   bind = SUPER SHIFT, P, exec, pkill rofi || rofi -show power-menu
 
   # Common program shortcuts
-  bind = SUPER, E, exec, emacsclient -c -a 'emacs'
+  bind = SUPER, E, exec, emacs
   bind = SUPER, B, exec, pkill rofi || rofi -show filebrowser
   bind = SUPER, Space, exec, pkill rofi || rofi -show combi
   bind = SUPER, Return, exec, alacritty