summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorSilas Schöffel <sils@sils.li>2024-04-25 18:24:36 +0200
committerSilas Schöffel <sils@sils.li>2024-04-25 18:24:36 +0200
commit9a81cce9cd2b9fad5d530f2794cbf845e946db35 (patch)
treeeca2d8692d6fc77df7d75ead24e57e40c0dacfb4
parentbat: move to module (diff)
downloadnix-config-9a81cce9cd2b9fad5d530f2794cbf845e946db35.tar.gz
nix-config-9a81cce9cd2b9fad5d530f2794cbf845e946db35.zip
gpg: improve behavior
-rw-r--r--hm/gpg/default.nix15
-rw-r--r--sys/environment/default.nix1
2 files changed, 10 insertions, 6 deletions
diff --git a/hm/gpg/default.nix b/hm/gpg/default.nix
index aecb4d4..12166e6 100644
--- a/hm/gpg/default.nix
+++ b/hm/gpg/default.nix
@@ -5,11 +5,16 @@
 }: {
   programs.gpg = {
     enable = true;
+    scdaemonSettings = {
+      disable-ccid = true;
+    };
   };
   services.gpg-agent = {
     enable = true;
-    defaultCacheTtl = 60 * 5;
-    defaultCacheTtlSsh = 60 * 5;
+    defaultCacheTtl = 60 * 50;
+    defaultCacheTtlSsh = 60 * 50;
+    maxCacheTtl = 60 * 50;
+    maxCacheTtlSsh = 60 * 50;
     pinentryPackage = pkgs.pinentry-curses;
     enableSshSupport = true;
     sshKeys = ["4077454831C98FE4BE4A9C167186C5A63615B790"];
@@ -20,7 +25,7 @@
     SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
     gpg-connect-agent /bye
   '';
-  home.sessionVariables = {
-    GNUPGHOME = lib.mkForce "";
-  };
+  #home.sessionVariables = {
+  #  GNUPGHOME = lib.mkForce "";
+  #};
 }
diff --git a/sys/environment/default.nix b/sys/environment/default.nix
index 879c541..e5b8c69 100644
--- a/sys/environment/default.nix
+++ b/sys/environment/default.nix
@@ -12,7 +12,6 @@
       ANSIBLE_HOME = "\${HOME}/.local/share/ansible";
       #_JAVA_OPTIONS	= '-Djava.util.prefs.userRoot="\${XDG_CONFIG_HOME}/java"';
       WINEPREFIX = "\${HOME}/.local/share/wine";
-      GNUPGHOME = lib.mkForce "";
       GRADLE_USER_HOME = "\${HOME}/.local/share/gradle";
       GTK2_RC_FILES = "\${HOME}/.config/gtk-2.0/gtkrc";
       EDITOR = "nvim";