Rid me of gpg-agent
This commit is contained in:
parent
53fcb21a18
commit
78cd53df9b
4 changed files with 16 additions and 11 deletions
|
@ -13,11 +13,11 @@ with lib; {
|
|||
## Gnome-keyring
|
||||
services.gnome-keyring = {
|
||||
enable = true;
|
||||
components = [ "pkcs11" "secrets" ];
|
||||
components = [ "pkcs11" "secrets" "ssh" ];
|
||||
};
|
||||
services.gpg-agent.enable = true;
|
||||
services.gpg-agent.pinentryFlavor = "curses";
|
||||
services.gpg-agent.enableSshSupport = true;
|
||||
# services.gpg-agent.enable = true;
|
||||
# services.gpg-agent.pinentryFlavor = "curses";
|
||||
# services.gpg-agent.enableSshSupport = true;
|
||||
|
||||
# Git "safe-directory"
|
||||
programs.git.extraConfig.safe.directory = [
|
||||
|
|
|
@ -197,7 +197,11 @@ in
|
|||
export SDL_VIDEODRIVER=wayland
|
||||
export QT_QPA_PLATFORM=wayland
|
||||
export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
|
||||
'';
|
||||
'' + (if config.services.gnome-keyring.enable then ''
|
||||
# gnome-keyring
|
||||
eval `${pkgs.gnome.gnome-keyring}/bin/gnome-keyring-daemon -r -d -c secrets,ssh,pkcs11`
|
||||
export SSH_AUTH_SOCK
|
||||
'' else "");
|
||||
# Extra
|
||||
wrapperFeatures.base = true;
|
||||
wrapperFeatures.gtk = true;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue