steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

tweak gpg related code

Browse source
This commit is contained in:
steveej 2025-04-05 21:33:13 +02:00
parent ff279090e5
commit eebb87ff14
4 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Justfile
View file

@ -222,7 +222,7 @@ install-config config root:
sudo just run-with-channels nixos-install -I nixos-config={{ invocation_directory() }}/{{ config }} --root {{ root }} --no-root-passwd sudo just run-with-channels nixos-install -I nixos-config={{ invocation_directory() }}/{{ config }} --root {{ root }} --no-root-passwd
# Switch between gpg-card capable devices which have a copy of the same key # Switch between gpg-card capable devices which have a copy of the same key
switch-gpg-card: switch-gpg-card key-id="6EEFA706CB17E89B":
#!/usr/bin/env bash #!/usr/bin/env bash
# #
# Derived from https://github.com/drduh/YubiKey-Guide/issues/19. # Derived from https://github.com/drduh/YubiKey-Guide/issues/19.
@ -230,7 +230,11 @@ switch-gpg-card:
# Connect the new device and then run this script to make it known to gnupg. # Connect the new device and then run this script to make it known to gnupg.
# #
set -xe set -xe
if [[ -n "{{key-id}}" ]]; then
KEY_ID="{{key-id}}"
else
KEY_ID=$(gpg --card-status | rg sec | rg -o '[0-9A-Z]{16}') KEY_ID=$(gpg --card-status | rg sec | rg -o '[0-9A-Z]{16}')
fi
# export pubkey and ownertrust # export pubkey and ownertrust
gpg2 --output "${KEY_ID}".pubkey --export "${KEY_ID}" gpg2 --output "${KEY_ID}".pubkey --export "${KEY_ID}"

2
nix/home-manager/configuration/graphical-fullblown.nix
View file

@ -105,7 +105,7 @@ in
# Password Management # Password Management
gnupg gnupg
# yubikey-manager yubikey-manager
yubikey-personalization yubikey-personalization
yubikey-personalization-gui yubikey-personalization-gui

4
nix/home-manager/programs/gpg-agent.nix
View file

@ -1,11 +1,11 @@
{ lib, pkgs, ... }: { lib, pkgs, osConfig, ... }:
{ {
home.packages = [ pkgs.gcr ]; home.packages = [ pkgs.gcr ];
programs.gpg.enable = true; programs.gpg.enable = true;
services.gpg-agent = { services.gpg-agent = {
enable = true; enable = true;
enableScDaemon = true; enableScDaemon = !osConfig.services.pcscd.enable;
enableSshSupport = true; enableSshSupport = true;
grabKeyboardAndMouse = true; grabKeyboardAndMouse = true;
pinentryPackage = lib.mkDefault pkgs.pinentry-gtk2; pinentryPackage = lib.mkDefault pkgs.pinentry-gtk2;

5
nix/os/devices/steveej-x13s/configuration.nix
View file

@ -161,6 +161,11 @@
]; ];
} }
{
# yubikey / smartcard. only set to `true` for `ykman piv` commands.
services.pcscd.enable = false;
}
# TODO: create syncthing os snippet # TODO: create syncthing os snippet
( (
let let