diff --git a/system/wm/hyprland.nix b/system/wm/hyprland.nix
index e278036..053b7f3 100644
--- a/system/wm/hyprland.nix
+++ b/system/wm/hyprland.nix
@@ -14,8 +14,11 @@
         auth include login
       '';
     };
+    pam.services.login.enableGnomeKeyring = true;
   };
 
+  services.gnome.gnome-keyring.enable = true;
+
   programs = {
     hyprland = {
       enable = true;
diff --git a/user/app/doom-emacs/doom.nix b/user/app/doom-emacs/doom.nix
index cd905b0..4363b56 100644
--- a/user/app/doom-emacs/doom.nix
+++ b/user/app/doom-emacs/doom.nix
@@ -4,7 +4,6 @@ let
   dashboardLogo = ./. + "/nix-" + themePolarity + ".png";
 in
 {
-  services.emacs.enable = true;
   programs.doom-emacs = {
     enable = true;
     emacsPackage = pkgs.emacs29-pgtk;
diff --git a/user/app/doom-emacs/doom.org b/user/app/doom-emacs/doom.org
index 66066ea..0a83094 100644
--- a/user/app/doom-emacs/doom.org
+++ b/user/app/doom-emacs/doom.org
@@ -1486,7 +1486,6 @@ let
   dashboardLogo = ./. + "/nix-" + themePolarity + ".png";
 in
 {
-  services.emacs.enable = true;
   programs.doom-emacs = {
     enable = true;
     emacsPackage = pkgs.emacs29-pgtk;
diff --git a/user/wm/hyprland/hyprland.nix b/user/wm/hyprland/hyprland.nix
index acd4e83..95e771a 100644
--- a/user/wm/hyprland/hyprland.nix
+++ b/user/wm/hyprland/hyprland.nix
@@ -15,12 +15,13 @@
     plugins = [ ];
     settings = { };
     extraConfig = ''
+      exec-once = dbus-update-activation-environment DISPLAY XAUTHORITY WAYLAND_DISPLAY
       exec-once = pypr
       exec-once = nm-applet
       exec-once = GOMAXPROCS=1 syncthing --no-browser
       exec-once = protonmail-bridge --noninteractive
-      exec-once = gnome-keyring-daemon --daemonize --login
-      exec-once = gnome-keyring-daemon --start --components=secrets
+      exec-once = waybar
+      exec-once = emacs --daemon
 
       exec-once = ~/.swayidle-stylix
       exec = ~/.swaybg-stylix
@@ -181,7 +182,15 @@
     hyprland-protocols
     hyprpicker
     swayidle
-    swaylock-effects
+    (pkgs.swaylock-effects.overrideAttrs (oldAttrs: {
+      version = "1.6.4-1";
+      src = fetchFromGitHub {
+        owner = "mortie";
+        repo = "swaylock-effects";
+        rev = "20ecc6a0a5b61bb1a66cfb513bc357f74d040868";
+        sha256 = "sha256-nYA8W7iabaepiIsxDrCkG/WIFNrVdubk/AtFhIvYJB8=";
+      };
+    }))
     swaybg
     fnott
     #hyprpaper