diff --git a/home/yt/common.nix b/home/yt/common.nix
index 77c98fe..4d7acca 100644
--- a/home/yt/common.nix
+++ b/home/yt/common.nix
@@ -44,7 +44,11 @@
         rebase = true;
         autostash = true;
       };
-      merge.tool = "vimdiff";
+      merge = {
+        tool = "vimdiff";
+        keepBackup = false;
+        prompt = false;
+      };
       rebase = {
         stat = true;
         autoStash = true;
@@ -52,10 +56,7 @@
         updateRefs = true;
       };
       help.autocorrect = 1;
-      mergetool = {
-        prompt = false;
-        path = "nvim-open";
-      };
+      "mergetool \"vimdiff\"".cmd = "nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'";
     };
   };
   programs.ripgrep.enable = true;
diff --git a/home/zsh/default.nix b/home/zsh/default.nix
index 994fa1f..363efd6 100644
--- a/home/zsh/default.nix
+++ b/home/zsh/default.nix
@@ -94,8 +94,8 @@
       "ga" = "git add";
       "gaa" = "git add --all";
       "gb" = "git branch";
-      "gc" = "git commit --verbose";
-      "gcmsg" = "git commit --message";
+      "gc" = "git commit --verbose -s";
+      "gcmsg" = "git commit -s --message";
       "gd" = "git diff";
       "gdca" = "git diff --cached";
       "gds" = "git diff --staged";