System Gen105 @ 2025-09-26-19:47:12 by jonas@monolith
This commit is contained in:
parent
6482c8be7f
commit
d914ebbdea
@ -15,18 +15,21 @@ in {
|
|||||||
};
|
};
|
||||||
|
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
# Include udev rules for yubikey.
|
|
||||||
services.udev.packages = with pkgs; [
|
services.udev.packages = with pkgs; [
|
||||||
yubikey-personalization
|
yubikey-personalization
|
||||||
];
|
];
|
||||||
|
|
||||||
# OTP Manager
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
|
gnupg
|
||||||
yubikey-personalization
|
yubikey-personalization
|
||||||
yubioath-flutter
|
yubioath-flutter
|
||||||
];
|
];
|
||||||
|
|
||||||
# Enable smartcard support
|
services.pcscd.enable = true;
|
||||||
hardware.gpgSmartcards.enable = true;
|
|
||||||
|
programs.gnupg.agent = {
|
||||||
|
enable = true;
|
||||||
|
enableSSHSupport = true;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -27,23 +27,16 @@ in {
|
|||||||
}
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
services.gpg-agent = {
|
# services.gpg-agent = {
|
||||||
enable = true;
|
# enable = true;
|
||||||
enableSshSupport = true;
|
# enableSshSupport = true;
|
||||||
enableZshIntegration = true;
|
# enableZshIntegration = true;
|
||||||
pinentry.package =
|
# };
|
||||||
if cfg.pinentry == "qt"
|
# home.sessionVariables = {
|
||||||
then pkgs.pinentry-qt
|
# SSH_AUTH_SOCK = "$XDG_RUNTIME_DIR/gnupg/S.gpg-agent.ssh";
|
||||||
else pkgs.pinentry.gnome3;
|
# };
|
||||||
extraConfig = ''
|
# systemd.user.settings.Manager.DefaultEnvironment = lib.mapAttrs (_: lib.mkDefault) {
|
||||||
allow-emacs-pinentry
|
# SSH_AUTH_SOCK = "/run/user/%U/gnupg/S.gpg-agent.ssh";
|
||||||
'';
|
# };
|
||||||
};
|
|
||||||
home.sessionVariables = {
|
|
||||||
SSH_AUTH_SOCK = "$XDG_RUNTIME_DIR/gnupg/S.gpg-agent.ssh";
|
|
||||||
};
|
|
||||||
systemd.user.settings.Manager.DefaultEnvironment = lib.mapAttrs (_: lib.mkDefault) {
|
|
||||||
SSH_AUTH_SOCK = "/run/user/%U/gnupg/S.gpg-agent.ssh";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user