From 22929fa5d8fafbbeeb8935749cbf019fe8ac26d3 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Thu, 31 Aug 2023 08:21:21 +0100
Subject: [PATCH] Add gpg and password-store to Monarch

Only set git credential.helper if using password-store
---
 home/git/default.nix   | 1 -
 home/pass/default.nix  | 2 ++
 hosts/Monarch/home.nix | 9 ++++++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/home/git/default.nix b/home/git/default.nix
index 30c72ba9..9a7d0f56 100644
--- a/home/git/default.nix
+++ b/home/git/default.nix
@@ -21,7 +21,6 @@
     extraConfig = {
       pull.rebase = false;
       init.defaultBranch = "main";
-      credential.helper = "${pkgs.gitFull}/bin/git-credential-libsecret";
     };
   };
 }
diff --git a/home/pass/default.nix b/home/pass/default.nix
index a589488d..3af78b8f 100644
--- a/home/pass/default.nix
+++ b/home/pass/default.nix
@@ -8,6 +8,8 @@
       package = pkgs.pass.withExtensions (exts: [ exts.pass-otp ]);
       settings.PASSWORD_STORE_DIR = "$HOME/.password-store";
     };
+    git.extraConfig.credential.helper =
+      "${pkgs.gitFull}/bin/git-credential-libsecret";
   };
   services.gpg-agent = {
     enable = true;
diff --git a/hosts/Monarch/home.nix b/hosts/Monarch/home.nix
index 68b7f51c..86417707 100644
--- a/hosts/Monarch/home.nix
+++ b/hosts/Monarch/home.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ pkgs, ... }:
 let
   username = "tux";
   homeDirectory = "/Users/${username}";
@@ -8,6 +8,7 @@ in {
     ../../home/git
     ../../home/ssh
     ../../home/tui
+    ../../home/tmux
     ../../home/alacritty
     ../../home/emacs
   ];
@@ -25,6 +26,12 @@ in {
       '';
     };
     emacs.package = pkgs.emacs29;
+    gpg.enable = true;
+    password-store = {
+      enable = true;
+      package = pkgs.pass.withExtensions (exts: [ exts.pass-otp ]);
+      settings.PASSWORD_STORE_DIR = "$HOME/.password-store";
+    };
   };
   services.syncthing.enable = true;
 }