From a89662e06da0ee9df301e49942af25387c5527a2 Mon Sep 17 00:00:00 2001
From: Mel <mel@rnrd.eu>
Date: Sat, 14 Feb 2026 23:28:06 +0100
Subject: Move over deprecated option paths to new paths for 25.11

Signed-off-by: Mel <mel@rnrd.eu>
---
 flake.nix               |  2 +-
 modules/home/common.nix | 21 ++++++++++++++++-----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/flake.nix b/flake.nix
index 4140dc6..5a3525d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -111,6 +111,6 @@
 
     # compatibility wrapper for nixos-option
     legacyPackages = lib.genAttrs (lib.attrValues systems)
-      (system: with packageSetsForSystem system; pkgs.recurseIntoAttrs pkgs);
+      (system: with packageSetsForSystem system; lib.recurseIntoAttrs pkgs);
   };
 }
diff --git a/modules/home/common.nix b/modules/home/common.nix
index 4eb0d56..cc9c68f 100644
--- a/modules/home/common.nix
+++ b/modules/home/common.nix
@@ -8,20 +8,31 @@ in
   programs = {
     git = {
       enable = true;
-      userName = "Mel";
-      userEmail = "mel@rnrd.eu";
       signing = {
         key = "D75A C286 ACA7 00B4 D8EC 377D 2082 F8EC 11CC 009B";
         signByDefault = true;
       };
       ignores = [
-        # ignore most vim swapfiles
-        "*~" "[._]*.sw?"
+        # ignore most vim swap-files
+        "*~"
+        "[._]*.sw?"
       ];
-      extraConfig = {
+
+      settings = {
+        user = {
+          name = "Mel";
+          email = "mel@rnrd.eu";
+        };
+
+        alias = {
+          "skip" = "update-index --skip-worktree";
+          "unskip" = "update-index --no-skip-worktree";
+        };
+
         init.defaultBranch = "main";
         pull.rebase = true;
       };
+
     };
 
     tmux = {
-- 
cgit 1.4.1