nki/nix-home
1
0
Fork 0
Code Issues Pull requests 2 Packages Projects Releases Wiki Activity

Rid me of gpg-agent

Browse source
This commit is contained in:
Natsu Kagami 2022-09-12 20:31:15 +02:00
parent 53fcb21a18
commit 78cd53df9b
Signed by: nki
GPG key ID: 7306B3D3C3AD6E51
4 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
home/common-linux.nix
View file

@ -13,11 +13,11 @@ with lib; {
## Gnome-keyring ## Gnome-keyring
services.gnome-keyring = { services.gnome-keyring = {
enable = true; enable = true;
components = [ "pkcs11" "secrets" ]; components = [ "pkcs11" "secrets" "ssh" ];
}; };
services.gpg-agent.enable = true; # services.gpg-agent.enable = true;
services.gpg-agent.pinentryFlavor = "curses"; # services.gpg-agent.pinentryFlavor = "curses";
services.gpg-agent.enableSshSupport = true; # services.gpg-agent.enableSshSupport = true;
# Git "safe-directory" # Git "safe-directory"
programs.git.extraConfig.safe.directory = [ programs.git.extraConfig.safe.directory = [

6
home/modules/programs/my-sway/default.nix
View file

@ -197,7 +197,11 @@ in
export SDL_VIDEODRIVER=wayland export SDL_VIDEODRIVER=wayland
export QT_QPA_PLATFORM=wayland export QT_QPA_PLATFORM=wayland
export QT_WAYLAND_DISABLE_WINDOWDECORATION="1" 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 # Extra
wrapperFeatures.base = true; wrapperFeatures.base = true;
wrapperFeatures.gtk = true; wrapperFeatures.gtk = true;

2
modules/services/pam/gnome-keyring.nix
View file

@ -7,6 +7,6 @@ in
options.nki.services.pam.enableGnomeKeyring = mkEnableOption "Enable gnome-keyring on login"; options.nki.services.pam.enableGnomeKeyring = mkEnableOption "Enable gnome-keyring on login";
config = mkIf cfg.enableGnomeKeyring { config = mkIf cfg.enableGnomeKeyring {
security.pam.services.login.enableGnomeKeyring = true; security.pam.services.login.enableGnomeKeyring = true;
security.pam.services.login.gnupg.enable = true; # security.pam.services.login.gnupg.enable = true;
}; };
} }

11
nki-home/configuration.nix
View file

@ -48,7 +48,7 @@
networking.wireless.iwd.enable = true; networking.wireless.iwd.enable = true;
# Set your time zone. # Set your time zone.
time.timeZone = "America/Toronto"; time.timeZone = "Europe/Zurich";
# The global useDHCP flag is deprecated, therefore explicitly set to false here. # The global useDHCP flag is deprecated, therefore explicitly set to false here.
# Per-interface useDHCP will be mandatory in the future, so this generated config # Per-interface useDHCP will be mandatory in the future, so this generated config
@ -170,10 +170,10 @@
# Some programs need SUID wrappers, can be configured further or are # Some programs need SUID wrappers, can be configured further or are
# started in user sessions. # started in user sessions.
programs.mtr.enable = true; programs.mtr.enable = true;
programs.gnupg.agent = { # programs.gnupg.agent = {
enable = true; # enable = true;
enableSSHSupport = true; # enableSSHSupport = true;
}; # };
# List services that you want to enable: # List services that you want to enable:
nki.services.edns.enable = true; nki.services.edns.enable = true;
@ -183,6 +183,7 @@
enable = true; enable = true;
wlr.enable = true; wlr.enable = true;
}; };
services.gnome.gnome-keyring.enable = true;
# Enable the OpenSSH daemon. # Enable the OpenSSH daemon.
services.openssh.enable = true; services.openssh.enable = true;