diff options
| author | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2026-08-23 20:07:00 +0200 |
|---|---|---|
| committer | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2026-08-23 20:07:00 +0200 |
| commit | 0107bfcf7edcbe7d0e59fa7e9c4a43307a500a29 (patch) | |
| tree | 2bee4f144ca435a8a6a9f3748e068a8f856b74be | |
| parent | modules/fish: Set the interactive shell init, not the general one (diff) | |
| download | nixos-config-0107bfcf7edcbe7d0e59fa7e9c4a43307a500a29.zip | |
modules/gpg: Use the default hm gpg-agent fish integration
| -rw-r--r-- | modules/by-name/gp/gpg/module.nix | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/modules/by-name/gp/gpg/module.nix b/modules/by-name/gp/gpg/module.nix index 28615adc..9be4cada 100644 --- a/modules/by-name/gp/gpg/module.nix +++ b/modules/by-name/gp/gpg/module.nix @@ -26,15 +26,16 @@ in { programs = { qutebrowser.key = "8321 ED3A 8DB9 99A5 1F3B F80F F268 2914 EA42 DE26"; - fish.integrations.gpg = - # fish - '' - set --export --global GPG_TTY $(tty) + # 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 + # ''; - # 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 '' @@ -90,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 |