1 files changed, 43 insertions, 17 deletions

diff --git a/modules/by-name/gp/gpg/module.nix b/modules/by-name/gp/gpg/module.nix
index d5136e92..9be4cada 100644
--- a/modules/by-name/gp/gpg/module.nix
+++ b/modules/by-name/gp/gpg/module.nix
@@ -22,7 +22,47 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    soispha.programs.qutebrowser.key = "8321 ED3A 8DB9 99A5 1F3B  F80F F268 2914 EA42 DE26";
+    soispha = {
+      programs = {
+        qutebrowser.key = "8321 ED3A 8DB9 99A5 1F3B  F80F F268 2914 EA42 DE26";
+
+        # fish.integrations.gpg =
+        #   # fish
+        #   ''
+        #     set --export --global GPG_TTY $(tty)
+        #
+        #     # Ensure that get gpg agent is started (necessary because ssh does not start it
+        #     # automatically and has it's tty updated)
+        #     gpg-connect-agent updatestartuptty /bye
+        #   '';
+
+        zsh.integrations.gpg =
+          # bash
+          ''
+            export GPG_TTY=$(tty)
+
+            # Magic copied from the gpg-agent manual
+            unset SSH_AGENT_PID
+            if [ "''${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
+                export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
+            fi
+
+
+            # Ensure that get gpg agent is started (necessary because ssh does not start it
+            # automatically and has it's tty updated)
+            gpg-connect-agent /bye
+          '';
+      };
+
+      services.unison.pathsToIgnore = [
+        # "Unknown filetype" (and there is no real reason to (try to) synchronize sockets)
+        "~/.local/share/gnupg/S.gpg-agent"
+        "~/.local/share/gnupg/S.gpg-agent.browser"
+        "~/.local/share/gnupg/S.gpg-agent.extra"
+        "~/.local/share/gnupg/S.gpg-agent.ssh"
+        "~/.local/share/gnupg/S.scdaemon"
+      ];
+    };
 
     home-manager.users.soispha = {
       programs.gpg = {
@@ -51,7 +91,8 @@ in {
       services = {
         gpg-agent = {
           enable = true;
-          enableZshIntegration = true;
+          enableZshIntegration = false;
+          enableFishIntegration = true;
           enableScDaemon = true; # smartcards and such things
 
           # Cache the key passwords
@@ -74,20 +115,5 @@ in {
         };
       };
     };
-
-    soispha.programs.zsh.integrations.gpg = ''
-      export GPG_TTY=$(tty)
-
-      # Magic copied from the gpg-agent manual
-      unset SSH_AGENT_PID
-      if [ "''${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
-          export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
-      fi
-
-
-      # Ensure that get gpg agent is started (necessary because ssh does not start it
-      # automatically and has it's tty updated)
-      gpg-connect-agent /bye
-    '';
   };
 }