gpg

4 files changed, 29 insertions, 1 deletions

diff --git a/modules/default.nix b/modules/default.nix
index a0510dc..d881953 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -9,5 +9,6 @@
     ./neovim
     ./qutebrowser
     ./services
+    ./gpg
   ];
 }
diff --git a/modules/gpg/default.nix b/modules/gpg/default.nix
new file mode 100644
index 0000000..85682b6
--- /dev/null
+++ b/modules/gpg/default.nix
@@ -0,0 +1,25 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.modules.gpg;
+
+  inherit (lib) mkEnableOption mkOption mkIf types;
+in
+{
+  options.modules.gpg = {
+    enable = mkEnableOption "gpg";
+  };
+
+  config = mkIf cfg.enable {
+    services.gpg-agent = {
+      enable = true;
+      # TODO: look into forwarding and extra socket, seems useful
+      enableBashIntegration = true;
+      enableZshIntegration = true;
+      # enableNushellIntegration = true;
+      enableSshSupport = true;
+      noAllowExternalCache = true;
+      pinentryPackage = pkgs.pinentry-qt;
+#      sshKeys = [ "36663E191B00E51513F90FA5CF2BCE8461C297CD" ];
+    };
+  };
+}
diff --git a/modules/sway/default.nix b/modules/sway/default.nix
index 5d81354..3027bad 100644
--- a/modules/sway/default.nix
+++ b/modules/sway/default.nix
@@ -183,7 +183,7 @@ in
           "${modifier}+Shift+c" = "kill";
 
           "${modifier}+Shift+r" = "reload";
-          "${modifier}+Shift+q" = "exec swaynag -t warning -m 'do you really want to exit?' -B 'yes, exit' 'exit-sway'";
+          "${modifier}+Shift+q" = "exec swaynag -t warning -m 'do you really want to exit?' -B 'yes, exit' 'swaymsg exit'";
 
           "${modifier}+${left}" = "focus left";
           "${modifier}+${down}" = "focus down";
diff --git a/void/home.nix b/void/home.nix
index 482e31c..be724e6 100644
--- a/void/home.nix
+++ b/void/home.nix
@@ -18,6 +18,8 @@
 
     foot.enable = true;
 
+    gpg.enable = true;
+
     neovim = {
       enable = true;
     };