chore: manage gpg

raexera · Oct 22, 2024 · a74f8af · a74f8af
1 parent 1087d10
commit a74f8af
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 10 deletions.
diff --git a/home/modules/programs/git.nix b/home/modules/programs/git.nix
@@ -1,4 +1,8 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  config,
+  ...
+}: {
   home.packages = with pkgs; [
     act
     gh
@@ -24,7 +28,7 @@
       userEmail = "[email protected]";
 
       signing = {
-        key = "A987FE77C066A909";
+        key = config.programs.gpg.settings.default-key;
         signByDefault = true;
       };
 

diff --git a/home/modules/programs/gpg.nix b/home/modules/programs/gpg.nix
@@ -0,0 +1,10 @@
+{config, ...}: {
+  programs.gpg = {
+    enable = true;
+    homedir = "${config.xdg.dataHome}/gnupg";
+    settings = {
+      default-key = "A987FE77C066A909";
+      use-agent = true;
+    };
+  };
+}
diff --git a/home/modules/services/gpg-agent.nix b/home/modules/services/gpg-agent.nix
@@ -0,0 +1,8 @@
+{pkgs, ...}: {
+  services.gpg-agent = {
+    enable = true;
+    enableSshSupport = true;
+    enableZshIntegration = true;
+    pinentryPackage = pkgs.pinentry-gnome3;
+  };
+}
diff --git a/home/profiles/yuki.nix b/home/profiles/yuki.nix
@@ -5,6 +5,7 @@
     ../modules/wayland/windowManager/hyprland
 
     ../modules/programs/firefox.nix
+    ../modules/programs/gpg.nix
     ../modules/programs/gtk.nix
     ../modules/programs/kitty.nix
     ../modules/programs/media
@@ -15,6 +16,7 @@
 
     ../modules/services/blueman-applet.nix
     ../modules/services/gnome-keyring.nix
+    ../modules/services/gpg-agent.nix
     ../modules/services/polkit-agent.nix
     ../modules/services/udiskie.nix
   ];

diff --git a/modules/programs/default.nix b/modules/programs/default.nix
@@ -1,7 +1,6 @@
 {
   imports = [
     ./bash.nix
-    ./gnupg.nix
     ./home-manager.nix
     ./npm.nix
     ./thunar.nix

diff --git a/modules/programs/gnupg.nix b/modules/programs/gnupg.nix