25.05 -> unstable

home-manager/no-gui.nix

@@ -157,7 +157,7 @@ in
         ffmpeg-full
 
         # microcontroller tooling
-        probe-rs
+        probe-rs-tools
 
         (python312.withPackages (
           ps: with ps; [
@@ -226,20 +226,19 @@ in
   programs.git = {
     enable = true;
     package = pkgs.git;
-    userName = "Simon Gardling";
-    userEmail = "titaniumtown@proton.me";
-
-    # better way to view diffs
-    delta.enable = true;
 
     lfs.enable = true;
 
-    extraConfig = {
+    settings = {
       init = {
         # master -> main
         defaultBranch = "main";
       };
       push.autoSetupRemote = true;
+      user = {
+        name = "Simon Gardling";
+        email = "titaniumtown@proton.me";
+      };
     };
 
     # gpg signing keys
@@ -248,4 +247,10 @@ in
       signByDefault = true;
     };
   };
+
+  # better way to view diffs
+  programs.delta = {
+    enable = true;
+    enableGitIntegration = true;
+  };
 }