home-manager/common.nix

@@ -85,6 +85,11 @@ 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

home-manager/users/notgne2.nix

@@ -25,7 +25,6 @@ in
   ];
 
   programs.vscode = {
-    package = pkgs.vscodium;
     userSettings = {
       "editor.bracketPairColorization.enabled" = true;
       "editor.guides.bracketPairs" = "active";
@@ -356,10 +355,17 @@ in
     base0F = "00f769";
   };
 
-  services.gpg-agent = {
-    enable = true;
-    enableSshSupport = true;
-  };
+  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
+  '';
 
   home.sessionVariables = {
     FZF_DEFAULT_COMMAND = "${pkgs.fd}/bin/fd --type f";
@@ -376,7 +382,7 @@ in
   '';
 
   programs.git = {
-    signing.key = "DAB666DB54866F92";
+    signing.key = "BB661E172B42A7F8";
     signing.signByDefault = true;
     enable = true;
     lfs.enable = true;

users/notgne2.nix

@@ -11,7 +11,6 @@
 
     openssh.authorizedKeys.keys = [
       "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6QX3kMz1z3+QrMZQldgc2Flp+YcxDGWyGp3umdGgGhI3b91IZoOpgxrKFa/XPCa37ysrrMn2z15qR0JazghQOXAPbRbf6ZZ7H4sYDhk8D6O9/1Kcpm1UTJtcz3I3/Da9RvM9f+2biknP2lQEyZN1rW8F/olMQ0rB5QUoJBpZxGnkGH3XXdRf7DAi+kZTQyrsnoWFtJvjKe1kzmXC6xyVtwDHPgQjDA7hD5dGbceMtIge5ZW3KFoQJLO/gWsOR+NXRaBy1cmYhaCW7i7e0+409IUWR5fwWyTHTKcXSLusZcbc1JQItJVkiUcDk0slLS9RT8Leg9OpbRrqJ9oDJO+DV notgne2@peppa"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPIBwL8/TuE5GT1708sR3rVc1C1g2DmoSf35kjXKKLcr yubi"
     ];
   };
 }