talexander/machine_setup
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Revert "Switching to a home-manager config did not fix it."

Browse Source 
This reverts commit 4599b38ebf.
This commit is contained in:
Tom Alexander
2025-01-02 10:27:25 -05:00
parent 4599b38ebf
commit 18d372c8ee
2 changed files with 26 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
nix/configuration/roles/gpg/default.nix
View File

@@ -42,53 +42,34 @@
home-manager.users.talexander =
{ pkgs, ... }:
{
# home.file.".gnupg/scdaemon.conf" = {
# source = ./files/scdaemon.conf;
# };
programs.gpg = {
enable = true; # does this install a user-specific version of gnupg in addition to the system-wide package installed in configuration.nix?
# homedir = "${config.home.homeDirectory}/.gnupg";
publicKeys = [
{
source = ./files/gpg.asc;
trust = 5;
}
];
settings = {
use-agent = true; # what relation does this have to the settings in configuration.nix and also to the home-manager gpg-agent settings below?
};
scdaemonSettings = {
disable-ccid = true; # disable gnupg's built-in smartcard reader function in order to default to system's smartcard reader (pcsclite package)
};
};
services.gpg-agent = {
enable = true;
enableSshSupport = true;
enableZshIntegration = true;
enableScDaemon = true; # what relation does this have with the scdaemon setting above and/or in configuration.nix?
pinentryPackage = pkgs.pinentry-qt;
defaultCacheTtl = 60;
maxCacheTtl = 120;
extraConfig = ''
ttyname $GPG_TTY
'';
home.file.".gnupg/scdaemon.conf" = {
source = ./files/scdaemon.conf;
};
};
# environment.persistence."/persist" = lib.mkIf (!config.me.buildingIso) {
# hideMounts = true;
# users.talexander = {
# directories = [
# {
# directory = ".gnupg";
# user = "talexander";
# group = "talexander";
# mode = "0700";
# } # Local keyring
# ];
# };
# };
# programs.gnupg.dirmngr.enable = true;
programs.gnupg.agent = {
enable = true;
enableSSHSupport = true;
pinentryPackage = pkgs.pinentry-qt;
# settings = {
# disable-ccid = true;
# };
};
environment.persistence."/persist" = lib.mkIf (!config.me.buildingIso) {
hideMounts = true;
users.talexander = {
directories = [
{
directory = ".gnupg";
user = "talexander";
group = "talexander";
mode = "0700";
} # Local keyring
];
};
};
# nixpkgs.overlays = [
# (final: prev: {
@@ -141,4 +122,5 @@
# })
# ];
programs.gnupg.agent.enableExtraSocket = true;
}