Update to nixos 25.11

1 files changed, 14 insertions, 9 deletions

diff --git a/home/git/default.nix b/home/git/default.nix
index 6d975e3..7fe4f41 100644
--- a/home/git/default.nix
+++ b/home/git/default.nix
@@ -1,15 +1,20 @@
 { pkgs, ... }:
 {
+  programs.diff-so-fancy = {
+    enable = true;
+    enableGitIntegration = true;
+  };
   programs.git = {
     enable = true;
-    aliases = {
-      lg = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit";
-    };
-    diff-so-fancy.enable = true;
-    maintenance.enable = true;
-    userEmail = "petri.hienonen@gmail.com";
-    userName = "Petri Hienonen";
-    extraConfig = {
+    settings = {
+      alias = {
+        lg = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit";
+      };
+      user = {
+        email = "petri.hienonen@gmail.com";
+        name = "Petri Hienonen";
+        signingkey = "76028181DD730D0C";
+      };
       core = {
         editor = "${pkgs.neovim}/bin/nvim";
         hooksPath = ".githooks/";
@@ -21,7 +26,7 @@
       merge.conflictStyle = "diff3";
       pull.rebase = true;
       tag.gpgSign = true;
-      user.signingkey = "76028181DD730D0C";
     };
+    maintenance.enable = true;
   };
 }