pre 25.11, but still master

config/home-manager.nix

@@ -31,14 +31,20 @@ in
     };
     git = {
       enable = true;
-      delta.enable = true;
-      userName = "Danilo Reyes";
-      userEmail = osConfig.my.email;
-      extraConfig = {
-        init.defaultBranch = "main";
+      settings = {
         pull.rebase = true;
+        init.defaultBranch = "main";
+        user = {
+          inherit (osConfig.my) email;
+          name = "Danilo Reyes";
+        };
       };
     };
+    delta = {
+      enable = true;
+      enableGitIntegration = true;
+    };
+    ssh.enableDefaultConfig = false;
     bash = lib.mkIf (shellType == "bash") {
       enable = true;
       historyFile = "\${XDG_STATE_HOME}/bash/history";

config/jawz.nix

@@ -30,6 +30,7 @@ in
     home.file.".librewolf/.stignore".source = ../dotfiles/stignore;
     programs.ssh = lib.mkIf config.my.secureHost {
       enable = true;
+      enableDefaultConfig = false;
       matchBlocks = {
         vps = {
           hostname = config.my.ips.vps;

config/stylix.nix

@@ -11,7 +11,7 @@ let
   };
   scheme = schemesFile.schemes.febroary;
   cfg = config.my.stylix;
-  gnomeEnabled = config.services.xserver.desktopManager.gnome.enable;
+  gnomeEnabled = config.services.desktopManager.gnome.enable;
 in
 {
   options.my.stylix.enable = lib.mkEnableOption "system-wide theming with Stylix";