diff --git a/home-manager/common.nix b/home-manager/common.nix
index 71177e8..ce5f95a 100644
--- a/home-manager/common.nix
+++ b/home-manager/common.nix
@@ -85,11 +85,6 @@ inputs:
 
       set -U __done_min_cmd_duration 2000
 
-      set -Ua fish_user_paths ~/.bin
-      set -Ua fish_user_paths ~/.local/bin
-      set -Ua fish_user_paths ~/.npm-global/bin
-      set -Ua fish_user_paths ~/.cargo/bin
-
       set -U fish_key_bindings fish_default_key_bindings
       set -g theme_nerd_fonts yes
       set -g theme_display_date no
diff --git a/home-manager/users/notgne2.nix b/home-manager/users/notgne2.nix
index 8dd7017..b8e71dc 100644
--- a/home-manager/users/notgne2.nix
+++ b/home-manager/users/notgne2.nix
@@ -355,17 +355,10 @@ in
     base0F = "00f769";
   };
 
-  programs.fish.interactiveShellInit = ''
-    export GPG_TTY=(tty)
-    ${pkgs.gnupg}/bin/gpgconf --launch gpg-agent
-  '';
-
-  home.file.".gnupg/gpg-agent.conf".text = ''
-    enable-ssh-support
-    pinentry-program ${pkgs.pinentry.curses}/bin/pinentry-curses
-    default-cache-ttl 60
-    max-cache-ttl 120
-  '';
+  services.gpg-agent = {
+    enable = true;
+    enableSshSupport = true;
+  };
 
   home.sessionVariables = {
     FZF_DEFAULT_COMMAND = "${pkgs.fd}/bin/fd --type f";
@@ -382,7 +375,7 @@ in
   '';
 
   programs.git = {
-    signing.key = "BB661E172B42A7F8";
+    signing.key = "750D8DC93BFE39F7";
     signing.signByDefault = true;
     enable = true;
     lfs.enable = true;
diff --git a/users/notgne2.nix b/users/notgne2.nix
index 92abf96..85e538f 100644
--- a/users/notgne2.nix
+++ b/users/notgne2.nix
@@ -11,6 +11,7 @@
 
     openssh.authorizedKeys.keys = [
       "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6QX3kMz1z3+QrMZQldgc2Flp+YcxDGWyGp3umdGgGhI3b91IZoOpgxrKFa/XPCa37ysrrMn2z15qR0JazghQOXAPbRbf6ZZ7H4sYDhk8D6O9/1Kcpm1UTJtcz3I3/Da9RvM9f+2biknP2lQEyZN1rW8F/olMQ0rB5QUoJBpZxGnkGH3XXdRf7DAi+kZTQyrsnoWFtJvjKe1kzmXC6xyVtwDHPgQjDA7hD5dGbceMtIge5ZW3KFoQJLO/gWsOR+NXRaBy1cmYhaCW7i7e0+409IUWR5fwWyTHTKcXSLusZcbc1JQItJVkiUcDk0slLS9RT8Leg9OpbRrqJ9oDJO+DV notgne2@peppa"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ8Gy1DK4Md9aTW0/q/Y5cNoZFjDcGogf3w5pCJ9GedX yubi"
     ];
   };
 }