Revert "natpunch-go: add package"

[julm/julm-nix.git] / homes / softwares / gnupg.nix

diff --git a/homes/softwares/gnupg.nix b/homes/softwares/gnupg.nix
index 86bb26e4c32ff4c2cc57841b5cd88f1317c1a981..677ac6445274b5ce70399f3f327e25ac9bfbc74b 100644 (file)
--- a/homes/softwares/gnupg.nix
+++ b/homes/softwares/gnupg.nix
@@ -1,19 +1,14 @@
 { pkgs, lib, config, options, ... }:
 {
 config = {
+/*
 home.activation.gnupg = lib.hm.dag.entryAfter ["writeBoundary"] ''
-  install -d -m700 ${lib.escapeShellArg config.home.homeDirectory}/.gnupg
-'';
-home.file.".gnupg/dirmngr.conf".text = ''
-  allow-ocsp
-  hkp-cacert ${gnupg/keyserver.pem}
-  keyserver hkps://keys.mayfirst.org
-  #use-tor
-  #log-file dirmngr.log
-  #standard-resolver
+  install -d -m700 ${lib.escapeShellArg config.programs.gpg.homedir}
 '';
+*/
 services.gpg-agent = {
   enableSshSupport = true;
+  enableExtraSocket = true;
   pinentryFlavor = if config.host.desktop then "gtk2" else "curses";
 };
 programs.gpg.settings = {
@@ -40,6 +35,14 @@ programs.gpg.settings = {
   use-agent = true;
   utf8-strings = true;
 };
+home.file."${config.programs.gpg.homedir}/dirmngr.conf".text = ''
+  allow-ocsp
+  hkp-cacert ${gnupg/keyserver.pem}
+  keyserver hkps://keys.mayfirst.org
+  #use-tor
+  #log-file dirmngr.log
+  #standard-resolver
+'';
 } // lib.optionalAttrs (options ? "nixpkgs") {
 nixpkgs.overlays = [ (self: super: {
   # Avoid rebuilding graphical dependencies