chore: upgrade to nixos 25.11

Signed-off-by: Lander Van den Bulcke <landervandenbulcke@gmail.com>

home/lander/features/cli/git/default.nix

@@ -20,9 +20,9 @@ in
 
   programs.git = {
     enable = true;
-    package = pkgs.gitAndTools.gitFull;
+    package = pkgs.gitFull;
 
-    extraConfig = {
+    settings = {
       user =
         let
           name = "Lander Van den Bulcke";
@@ -67,19 +67,22 @@ in
 
       # diff3 merge
       merge.conflictStyle = "diff3";
-    };
 
-    # This is optional, as `git identity` will call the `git-identity` script by itself, however
-    # setting it up explicitly as an alias gives you autocomplete
-    aliases = {
-      identity = "! git-identity";
-      id = "! git-identity";
+      # This is optional, as `git identity` will call the `git-identity` script by itself, however
+      # setting it up explicitly as an alias gives you autocomplete
+      alias = {
+        identity = "! git-identity";
+        id = "! git-identity";
+      };
     };
+  };
 
-    # use difftastic
-    difftastic = {
+  # use difftastic
+  programs.difftastic = {
+    enable = true;
+    git = {
       enable = true;
-      enableAsDifftool = true;
+      diffToolMode = true;
     };
   };
 

home/lander/features/cli/zsh.nix

@@ -1,9 +1,9 @@
-{ pkgs, ... }:
+{ config, pkgs, ... }:
 {
   programs = {
     zsh = {
       enable = true;
-      dotDir = ".config/zsh";
+      dotDir = "${config.home.homeDirectory}/.config/zsh";
 
       enableCompletion = true;
       autosuggestion.enable = true;
@@ -41,7 +41,7 @@
         zstyle ':completion:*' list-colors "''${(s.:.)LS_COLORS}"
 
         # HACK! Simple shell function to patch ruff bins downloaded by tox from PyPI to use
-        # the ruff included in NixOS - needs to be run each time the tox enviroment is
+        # the ruff included in NixOS - needs to be run each time the tox environment is
         # recreated
         patch_tox_ruff() {
           for x in $(find .tox -name ruff -type f -print); do

home/lander/heimdall.nix

@@ -11,6 +11,8 @@
 
   programs.ssh = {
     enable = true;
+    enableDefaultConfig = false;
+
     matchBlocks = {
       "*.escapeangle.com" = {
         addressFamily = "inet";