Use a more compatible ssh-agent
This commit is contained in:
parent
7fc1816b54
commit
20fa17d09c
|
@ -12,10 +12,11 @@ with lib; {
|
||||||
## Gnome-keyring
|
## Gnome-keyring
|
||||||
services.gnome-keyring = {
|
services.gnome-keyring = {
|
||||||
enable = true;
|
enable = true;
|
||||||
components = [ "pkcs11" "secrets" "ssh" ];
|
components = [ "pkcs11" "secrets" ];
|
||||||
};
|
};
|
||||||
services.gpg-agent.enable = true;
|
services.gpg-agent.enable = true;
|
||||||
services.gpg-agent.pinentryFlavor = "gnome3";
|
services.gpg-agent.pinentryFlavor = "curses";
|
||||||
|
services.gpg-agent.enableSshSupport = true;
|
||||||
|
|
||||||
# Git "safe-directory"
|
# Git "safe-directory"
|
||||||
programs.git.extraConfig.safe.directory = [
|
programs.git.extraConfig.safe.directory = [
|
||||||
|
|
|
@ -32,11 +32,6 @@
|
||||||
if test -e /opt/homebrew/bin/brew
|
if test -e /opt/homebrew/bin/brew
|
||||||
/opt/homebrew/bin/brew shellenv | source
|
/opt/homebrew/bin/brew shellenv | source
|
||||||
end
|
end
|
||||||
|
|
||||||
# Gnome-keyring startup
|
|
||||||
if type -q gnome-keyring-daemon
|
|
||||||
set -x (gnome-keyring-daemon | string split "=")
|
|
||||||
end
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
interactiveShellInit = ''
|
interactiveShellInit = ''
|
||||||
|
|
Loading…
Reference in a new issue