From 814c639775109da09cc9fd46920138ed2d2bb795 Mon Sep 17 00:00:00 2001
From: Stefan Ellmauthaler <stefan.ellmauthaler@tu-dresden.de>
Date: Thu, 28 Apr 2022 16:22:56 +0200
Subject: [PATCH] Fix gpgsm path in git config; Add safe directory

---
 programs/emacs/default.el | 2 +-
 users/ellmau/git.nix      | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/programs/emacs/default.el b/programs/emacs/default.el
index bed2c9e..4e8dc19 100644
--- a/programs/emacs/default.el
+++ b/programs/emacs/default.el
@@ -202,7 +202,7 @@
          ("<f6>" . magit-log)
          ("<f7>" . magit-status))
   :custom
-  (magit-commit-signoff t)
+  ;(magit-commit-signoff t)
   (magit-define-global-key-bindings t)
   (magit-revert-buffers 'silent t)
   (magit-use-overlays nil))
diff --git a/users/ellmau/git.nix b/users/ellmau/git.nix
index 51b2f79..6aeb619 100644
--- a/users/ellmau/git.nix
+++ b/users/ellmau/git.nix
@@ -11,7 +11,7 @@
           core = { editor = "emacsclient"; };
           gpg = lib.mkIf config.variables.git.gpgsm {
             format = "x509";
-            program = "gpgsm";
+            program = "${pkgs.gpgsm}/bin/gpgsm";
           };
           #gpg = {
           #  format = "x509";
@@ -20,6 +20,7 @@
           user = { signingKey = config.variables.git.key;  };
           init = { defaultBranch = "main";};
           branch = { autosetuprebase = "always";};
+          safe.directory = [ "/etc/nixos" ];
         };
         lfs.enable = true;
       };