1
0

configuration/gpg-ssh: Move GPG and SSH integration to seperate module

This commit is contained in:
clerie 2024-04-15 08:44:09 +02:00
parent 66d369bbd9
commit 2ae649af80
3 changed files with 26 additions and 9 deletions
configuration
desktop
gpg-ssh
hosts/_iso

View File

@ -1,19 +1,14 @@
{ pkgs, ... }:
{
imports = [
../../configuration/gpg-ssh
];
programs.gnupg.agent = {
enable = true;
enableSSHSupport = true;
pinentryPackage = pkgs.pinentry-gtk2;
};
# Add wrapper around ssh that takes the gnupg ssh-agent
# instead of gnome-keyring
environment.systemPackages = with pkgs; [
ssh-gpg
];
# Do not disable ssh-agent of gnome-keyring, because
# gnupg ssh-agent can't handle normal SSH keys properly
/*

View File

@ -0,0 +1,21 @@
{ pkgs, lib, ... }:
{
programs.gnupg.agent = {
enable = true;
enableSSHSupport = true;
pinentryPackage = lib.mkDefault pkgs.pinentry-curses;
};
environment.systemPackages = with pkgs; [
gnupg
# Add wrapper around ssh that takes the gnupg ssh-agent
# instead of gnome-keyring
ssh-gpg
];
services.pcscd.enable = true;
}

View File

@ -3,6 +3,7 @@
{
imports = [
(modulesPath + "/installer/cd-dvd/installation-cd-base.nix")
../../configuration/gpg-ssh
];
networking.hostName = "isowo";