diff --git a/user/app/doom-emacs/doom.nix b/user/app/doom-emacs/doom.nix
index 9f3c384..b1544f4 100644
--- a/user/app/doom-emacs/doom.nix
+++ b/user/app/doom-emacs/doom.nix
@@ -41,8 +41,6 @@ in
   # End block
   };
 
-  services.emacs.enable = true;
-
   home.file.".emacs.d/themes/doom-stylix-theme.el".source = config.lib.stylix.colors {
       template = builtins.readFile ./themes/doom-stylix-theme.el.mustache;
       extension = ".el";
diff --git a/user/app/doom-emacs/doom.org b/user/app/doom-emacs/doom.org
index d8e25a1..eb51346 100644
--- a/user/app/doom-emacs/doom.org
+++ b/user/app/doom-emacs/doom.org
@@ -2118,8 +2118,6 @@ in
   # End block
   };
 
-  services.emacs.enable = true;
-
   home.file.".emacs.d/themes/doom-stylix-theme.el".source = config.lib.stylix.colors {
       template = builtins.readFile ./themes/doom-stylix-theme.el.mustache;
       extension = ".el";
diff --git a/user/wm/hyprland/hyprland.nix b/user/wm/hyprland/hyprland.nix
index 966d8fe..279b83b 100644
--- a/user/wm/hyprland/hyprland.nix
+++ b/user/wm/hyprland/hyprland.nix
@@ -48,6 +48,7 @@ in
 
       exec-once = hyprprofile Default
 
+      exec-once = emacs --daemon
       exec-once = pypr
       exec-once = ydotoold
       #exec-once = STEAM_FRAME_FORCE_CLOSE=1 steam -silent
@@ -152,7 +153,8 @@ in
          }
        }
 
-       bind=SUPER,SUPER_L,exec,nwggrid-wrapper
+       bind=SUPER,code:9,exec,nwggrid-wrapper
+       bind=SUPER,code:66,exec,nwggrid-wrapper
        bind=SUPER,SPACE,fullscreen,1
        bind=SUPERSHIFT,F,fullscreen,0
        bind=SUPER,Y,workspaceopt,allfloat
@@ -358,7 +360,7 @@ in
 
        misc {
          disable_hyprland_logo = true
-         mouse_move_enables_dpms = false
+         mouse_move_enables_dpms = true
        }
        decoration {
          rounding = 8
@@ -412,8 +414,8 @@ in
       src = fetchFromGitHub {
         owner = "hyprland-community";
         repo = "pyprland";
-        rev = "refs/tags/2.3.8";
-        hash = "sha256-0YUI2/gJmBoummiHGpq2p2sT25SwCdnsRwfGK2pcm4s=";
+        rev = "refs/tags/2.4.0";
+        hash = "sha256-jK6ap/beiqAtZXVNqPB3zV8R2Kfc3LhqJBvFlWYIfb4=";
       };
     }))
     (hyprnome.override (oldAttrs: {
@@ -618,6 +620,7 @@ in
     listener {
       timeout = 7200 # in seconds
       on-timeout = systemctl suspend
+      on-resume = hyprctl dispatch dpms on
     }
   '';
   home.file.".config/hypr/hyprlock.conf".text = ''
@@ -835,7 +838,7 @@ in
         clock = {
           "interval" = 1;
           "format" = "{:%a %Y-%m-%d %I:%M:%S %p}";
-          "timezone" = "America/Chicago";
+          "timezone" = systemSettings.timezone;
           "tooltip-format" = ''
             <big>{:%Y %B}</big>
             <tt><small>{calendar}</small></tt>'';