diff --git a/dotfiles/hypr/.luarc.json b/dotfiles/hypr/.luarc.json
index 954e638..90b46ec 120000
--- a/dotfiles/hypr/.luarc.json
+++ b/dotfiles/hypr/.luarc.json
@@ -1 +1 @@
-/nix/store/33xkglgxywlshxi7d3mqb9plbv8z30zm-home-manager-files/.config/hypr/.luarc.json
\ No newline at end of file
+/nix/store/m7baqiydal7zmd55ki3lbh7qqc8xr0ms-home-manager-files/.config/hypr/.luarc.json
\ No newline at end of file
diff --git a/dotfiles/hypr/conf/binding.lua b/dotfiles/hypr/conf/binding.lua
index 82f3d52..267aaba 100644
--- a/dotfiles/hypr/conf/binding.lua
+++ b/dotfiles/hypr/conf/binding.lua
@@ -1,12 +1,9 @@
 -- shutdown hyprland and lock
-hl.bind("CTRL + ALT + M", function()
-	if os.execute("command -v hyprshutdown >/dev/null 2>&1") then
-		hl.dsp.exec_cmd("hyprshutdown")()
-	else
-		hl.dsp.exit()
-	end
-end, { description = "hyprland shutdown" })
-
+hl.bind(
+	"CTRL + ALT + M",
+	hl.dsp.exec_cmd("command -v hyprshutdown >/dev/null 2>&1 && hyprshutdown || hyprctl dispatch exit"),
+	{ description = "hyprland shutdown" }
+)
 hl.bind("CTRL + ALT + L", hl.dsp.exec_cmd(lockscreen))
 -- launchers
 hl.bind("ALT + D", hl.dsp.exec_cmd(fileManager))
diff --git a/dotfiles/hypr/hyprland.lua b/dotfiles/hypr/hyprland.lua
index 25d014d..99f0bf8 120000
--- a/dotfiles/hypr/hyprland.lua
+++ b/dotfiles/hypr/hyprland.lua
@@ -1 +1 @@
-/nix/store/33xkglgxywlshxi7d3mqb9plbv8z30zm-home-manager-files/.config/hypr/hyprland.lua
\ No newline at end of file
+/nix/store/m7baqiydal7zmd55ki3lbh7qqc8xr0ms-home-manager-files/.config/hypr/hyprland.lua
\ No newline at end of file
diff --git a/dotfiles/inkscape/palettes b/dotfiles/inkscape/palettes
index 092348a..f43950b 120000
--- a/dotfiles/inkscape/palettes
+++ b/dotfiles/inkscape/palettes
@@ -1 +1 @@
-/nix/store/33xkglgxywlshxi7d3mqb9plbv8z30zm-home-manager-files/.config/inkscape/palettes
\ No newline at end of file
+/nix/store/m7baqiydal7zmd55ki3lbh7qqc8xr0ms-home-manager-files/.config/inkscape/palettes
\ No newline at end of file
diff --git a/dotfiles/inkscape/templates b/dotfiles/inkscape/templates
index 38fcad9..51c44f1 120000
--- a/dotfiles/inkscape/templates
+++ b/dotfiles/inkscape/templates
@@ -1 +1 @@
-/nix/store/33xkglgxywlshxi7d3mqb9plbv8z30zm-home-manager-files/.config/inkscape/templates
\ No newline at end of file
+/nix/store/m7baqiydal7zmd55ki3lbh7qqc8xr0ms-home-manager-files/.config/inkscape/templates
\ No newline at end of file
diff --git a/dotfiles/kitty/kitty.conf b/dotfiles/kitty/kitty.conf
index 4d697b5..0ab59d4 120000
--- a/dotfiles/kitty/kitty.conf
+++ b/dotfiles/kitty/kitty.conf
@@ -1 +1 @@
-/nix/store/33xkglgxywlshxi7d3mqb9plbv8z30zm-home-manager-files/.config/kitty/kitty.conf
\ No newline at end of file
+/nix/store/m7baqiydal7zmd55ki3lbh7qqc8xr0ms-home-manager-files/.config/kitty/kitty.conf
\ No newline at end of file
diff --git a/home/afoucaultc/home-laptop.nix b/home/afoucaultc/home-laptop.nix
index 1ae62a4..63f4697 100644
--- a/home/afoucaultc/home-laptop.nix
+++ b/home/afoucaultc/home-laptop.nix
@@ -9,6 +9,7 @@
     ./packages/btop.nix
     ./packages/firefox.nix
     ./packages/git.nix
+    ./packages/security.nix
     ./packages/hyprland.nix
     ./packages/kitty.nix
     ./packages/mpv.nix
diff --git a/home/afoucaultc/home.nix b/home/afoucaultc/home.nix
index e5f6141..1cc991c 100644
--- a/home/afoucaultc/home.nix
+++ b/home/afoucaultc/home.nix
@@ -9,6 +9,7 @@
     ./packages/btop.nix
     ./packages/firefox.nix
     ./packages/git.nix
+    ./packages/security.nix
     ./packages/hyprland.nix
     ./packages/kitty.nix
     ./packages/mpv.nix
diff --git a/home/afoucaultc/packages/niri/conf/input.nix b/home/afoucaultc/packages/niri/conf/input.nix
index 480bbae..5779713 100644
--- a/home/afoucaultc/packages/niri/conf/input.nix
+++ b/home/afoucaultc/packages/niri/conf/input.nix
@@ -42,7 +42,7 @@
     };
 
     focus-follows-mouse = {
-      enable = true;
+      enable = false;
     };
   };
 
diff --git a/home/afoucaultc/packages/niri/conf/misc.nix b/home/afoucaultc/packages/niri/conf/misc.nix
index 80564d2..5db8427 100644
--- a/home/afoucaultc/packages/niri/conf/misc.nix
+++ b/home/afoucaultc/packages/niri/conf/misc.nix
@@ -11,13 +11,6 @@
           "${config.home.homeDirectory}/nixos-config/dotfiles/hypr/wallpaper/nix-wallpaper.png"
         ];
       }
-      {
-        command = [
-          "gnome-keyring-daemon"
-          "--start"
-          "--components=secrets"
-        ];
-      }
     ];
     environment = {
       #DISPLAY = null;
diff --git a/home/afoucaultc/packages/security.nix b/home/afoucaultc/packages/security.nix
new file mode 100644
index 0000000..62e4fdd
--- /dev/null
+++ b/home/afoucaultc/packages/security.nix
@@ -0,0 +1,11 @@
+{ ... }:
+{
+  services.gnome-keyring = {
+    enable = true;
+    components = [ "secrets" ];
+  };
+  programs.gpg.enable = true;
+  services.gpg-agent = {
+    enable = true;
+  };
+}
diff --git a/hosts/common/system_packages.nix b/hosts/common/system_packages.nix
index 0b2c4b7..3346498 100644
--- a/hosts/common/system_packages.nix
+++ b/hosts/common/system_packages.nix
@@ -4,6 +4,7 @@
     git
     vim
     gnumake
+    gnupg
     gcc
     wget
     curl