From 07f77a6ba05e5fc4b72ca47a43acc4ed0e2d4495 Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Fri, 12 Dec 2025 13:11:38 +0100
Subject: Update to 25.11, manually pull in deprecated stuff for emacs

I do not understand why helm-ag and helm-sweep were removed in MELPA… They work perfectly fine.
---
 home.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'home.nix')

diff --git a/home.nix b/home.nix
index 2e068c4..c2377fb 100644
--- a/home.nix
+++ b/home.nix
@@ -29,14 +29,15 @@
 
   programs.git = {
     enable = true;
-    package = pkgs.gitAndTools.gitFull;
+    package = pkgs.gitFull;
     lfs.enable = true;
-    difftastic.enable = true;
 
-    userName  = "Adrian Kummerlaender";
-    userEmail = "adrian@kummerlaender.eu";
+    settings.user = {
+      name  = "Adrian Kummerlaender";
+      email = "adrian@kummerlaender.eu";
+    };
 
-    extraConfig = {
+    settings = {
       core.editor = "vim";
       merge.tool = "${pkgs.meld}/bin/meld";
       pull.ff = "only";
@@ -45,6 +46,8 @@
     };
   };
 
+  programs.difftastic.enable = true;
+
   programs.ssh = {
     enable = true;
     matchBlocks = {
-- 
cgit v1.2.3