fix issue with password-store

4 files changed, 9 insertions, 2 deletions

diff --git a/modules/gpg/default.nix b/modules/gpg/default.nix
index 37e8b04..59323f3 100644
--- a/modules/gpg/default.nix
+++ b/modules/gpg/default.nix
@@ -10,6 +10,11 @@ in
   };
 
   config = mkIf cfg.enable {
+#    home.packages = with pkgs; [
+#    pinentry-bemenu
+#    (writeShellScriptBin "pinentry-menu" ''
+#      exec ${pkgs.pinentry-bemenu}/bin/pinentry-bemenu -l 10 --nf "#4c4c4c" --nb "#0f0f0f" --af "#4c4c4c" --ab "#0f0f0f" --tb "#0f0f0f" --tf "#8aac8b" --sb "#0f0f0f" --sf "#8aac8b"--hb "#0f0f0f" --hf "#8aac8b" --fn "ComicShannsMono Nerd Font Mono 12" 
+#    '')];
     services.gpg-agent = {
       enable = true;
       # TODO: look into forwarding and extra socket, seems useful
@@ -19,7 +24,7 @@ in
       enableSshSupport = true;
       noAllowExternalCache = true;
       pinentryPackage = pkgs.pinentry-qt;
-#      sshKeys = [ "36663E191B00E51513F90FA5CF2BCE8461C297CD" ];
+      #sshKeys = [ "36663E191B00E51513F90FA5CF2BCE8461C297CD" ];
     };
 
     home.file.".gnupg/pinentry-dmenu.conf" = {
diff --git a/modules/pass/default.nix b/modules/pass/default.nix
index e73fd76..fb24ab1 100644
--- a/modules/pass/default.nix
+++ b/modules/pass/default.nix
@@ -55,6 +55,7 @@ in
       };
       enable = true;
       settings = {
+        PASSWORD_STORE_DIR = "${config.home.homeDirectory}/.password-store";
         PASSWORD_STORE_CHARACTER_SET="[:alnum:]*!@^&_\-=[]|;~,./?";
         PASSWORD_STORE_CLIP_TIME="25";
         PASSWORD_STORE_KEY=cfg.key;
diff --git a/modules/sway/default.nix b/modules/sway/default.nix
index d6b0eec..d79dbdf 100644
--- a/modules/sway/default.nix
+++ b/modules/sway/default.nix
@@ -48,7 +48,7 @@ in
         };
 
         terminal = "${cfg.terminal}";
-        menu = "wmenu-run -n 4c4c4c -N 0d0d0d -s 8aac8b -S 0d0d0d -l 10";
+        menu = ''wmenu-run -n 4c4c4c -N 0d0d0d -s 8aac8b -S 0d0d0d -l 10 -f "ComicShannsMono Nerd Font Mono 10"'';
     
         defaultWorkspace = "workspace number 1";
 
diff --git a/void/home.nix b/void/home.nix
index 08b9615..da66e49 100644
--- a/void/home.nix
+++ b/void/home.nix
@@ -22,6 +22,7 @@
 
     pass = {
       enable = true;
+      key = "B5200ABFBD213FC9C17C6DB91291CBBCF3B9F225";
     };
 
     neovim = {