From ffbef38f9619f482d2dca8d3f64695f49d031634 Mon Sep 17 00:00:00 2001
From: oddlama <oddlama@oddlama.org>
Date: Sat, 30 Sep 2023 19:39:11 +0200
Subject: [PATCH] fix: force git commit signing the proper way

---
 users/myuser/git.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/users/myuser/git.nix b/users/myuser/git.nix
index cece35c..71ca0dd 100644
--- a/users/myuser/git.nix
+++ b/users/myuser/git.nix
@@ -43,6 +43,7 @@
       init.defaultBranch = "main";
       merge.conflictstyle = "diff3";
       mergetool.prompt = true;
+      commit.gpgsign = true;
       pull.rebase = true;
       push.autoSetupRemote = true;
     };
@@ -51,7 +52,6 @@
       s = "status";
       tags = "tag -l";
       t = "tag -s -m ''";
-      rebase = "rebase --gpg-sign";
       fixup = ''!f() { TARGET=$(git rev-parse "$1"); git commit --fixup=$TARGET ''${@:2} && EDITOR=true git rebase -i --gpg-sign --autostash --autosquash $TARGET^; }; f'';
       # An alias that uses the previous commit message by default.
       # Useful when you mess up entering the signing password and git aborts.