From b75cef08ef5054a574f54d1994390e5e37c1706b Mon Sep 17 00:00:00 2001
From: Daylin Morgan <daylinmorgan@gmail.com>
Date: Mon, 29 Jan 2024 10:43:35 -0600
Subject: [PATCH] abstract gpg

---
 hosts/algiz/default.nix    |  9 ++-------
 hosts/mannaz/default.nix   |  4 ----
 hosts/othalan/default.nix  |  6 +-----
 modules/common.nix         |  1 +
 modules/editors/vscode.nix | 10 +++++-----
 modules/security/gpg.nix   |  6 ++++++
 6 files changed, 15 insertions(+), 21 deletions(-)
 create mode 100644 modules/security/gpg.nix

diff --git a/hosts/algiz/default.nix b/hosts/algiz/default.nix
index 2274236..0db5cd8 100644
--- a/hosts/algiz/default.nix
+++ b/hosts/algiz/default.nix
@@ -2,7 +2,7 @@
   inputs,
   pkgs,
   ...
-}:{
+}: {
   imports = with inputs.self.nixosModules; [
     docker
   ];
@@ -18,7 +18,7 @@
 
     (pkgs.writeShellScriptBin "gitea" ''
       ssh -p 2222 -o StrictHostKeyChecking=no git@127.0.0.1 "SSH_ORIGINAL_COMMAND=\"$SSH_ORIGINAL_COMMAND\" $0 $@"
-      '')
+    '')
   ];
 
   # https://francis.begyn.be/blog/nixos-restic-backups
@@ -42,9 +42,4 @@
       isNormalUser = true;
     };
   };
-
-  programs.gnupg.agent = {
-    enable = true;
-    enableSSHSupport = true;
-  };
 }
diff --git a/hosts/mannaz/default.nix b/hosts/mannaz/default.nix
index ef00947..50f4422 100644
--- a/hosts/mannaz/default.nix
+++ b/hosts/mannaz/default.nix
@@ -19,8 +19,4 @@
   };
 
   users.users.daylin.extraGroups = ["docker"];
-  programs.gnupg.agent = {
-    enable = true;
-    enableSSHSupport = true;
-  };
 }
diff --git a/hosts/othalan/default.nix b/hosts/othalan/default.nix
index f773c92..cc51271 100644
--- a/hosts/othalan/default.nix
+++ b/hosts/othalan/default.nix
@@ -25,6 +25,7 @@
     rclone
     quarto
   ];
+
   programs.hyprland.enable = true;
 
   services.vpn.enable = true;
@@ -36,11 +37,6 @@
     paths = ["/home/daylin/stuff/" "/home/daylin/dev/"];
   };
 
-  programs.gnupg.agent = {
-    enable = true;
-    enableSSHSupport = true;
-  };
-
   users.users.daylin.extraGroups = [
     "audio"
   ];
diff --git a/modules/common.nix b/modules/common.nix
index 440f697..cda2c7a 100644
--- a/modules/common.nix
+++ b/modules/common.nix
@@ -10,6 +10,7 @@
     dev
     nvim
     vpn
+    gpg
 
     # gui
     fonts
diff --git a/modules/editors/vscode.nix b/modules/editors/vscode.nix
index f09e9a8..6fa19ab 100644
--- a/modules/editors/vscode.nix
+++ b/modules/editors/vscode.nix
@@ -8,9 +8,9 @@
   cfg = config.desktop;
 in {
   config = mkIf cfg.enable {
-  environment.systemPackages = with pkgs; [
-    # vscode
-    vscode-fhs
-  ];
-};
+    environment.systemPackages = with pkgs; [
+      # vscode
+      vscode-fhs
+    ];
+  };
 }
diff --git a/modules/security/gpg.nix b/modules/security/gpg.nix
new file mode 100644
index 0000000..836218d
--- /dev/null
+++ b/modules/security/gpg.nix
@@ -0,0 +1,6 @@
+{...}: {
+  programs.gnupg.agent = {
+    enable = true;
+    enableSSHSupport = true;
+  };
+}