diff --git a/users/functionalhacker/home.nix b/users/functionalhacker/home.nix
index 0b3bceef..08ec2598 100644
--- a/users/functionalhacker/home.nix
+++ b/users/functionalhacker/home.nix
@@ -12,7 +12,6 @@
       fd
       gcc
       neovide
-      neovim
       nerdfonts
       nodejs
       pass
@@ -110,6 +109,23 @@
       enable = true;
       userName = "Marko Korhonen";
       userEmail = "marko@korhonen.cc";
+
+      extraConfig = {
+        user.signingkey = "F2B9F713E7ED627336DD85E444FA3F28CD931BB0";
+        commit = {
+          gpgsign = true;
+          signoff = true;
+        };
+        tag = {
+          gpgsign = true;
+          signoff = true;
+        };
+        merge = {
+          prompt = false;
+          conflictstyle = "diff3";
+          tool = "nvim";
+        };
+      };
     };
   };
 }