chore: upgrade 25.11

modules/home/programs/terminal/bash/default.nix

@@ -29,7 +29,6 @@ in
         EDITOR="$VISUAL"
 
         fastfetch
-        eval "$(thefuck --alias)"
       '';
     };
 
@@ -58,7 +57,6 @@ in
     };
 
     home.packages = with pkgs; [
-      thefuck
       fastfetch
       bashInteractive
       nerd-fonts.meslo-lg

modules/home/programs/terminal/git/default.nix

@@ -11,22 +11,12 @@ in
   config = mkIf cfg.enable {
     programs.git = {
       enable = true;
-      userName = "Evan Reichard";
-      aliases = {
-        lg = "log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all -n 15";
-      };
-      includes = [
-        {
-          path = "~/.config/git/work";
-          condition = "gitdir:~/Development/git/work/";
-        }
-        {
-          path = "~/.config/git/personal";
-          condition = "gitdir:~/Development/git/personal/";
-        }
-      ];
-      extraConfig = {
+      settings = {
+        aliases = {
+          lg = "log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all -n 15";
+        };
         user = {
+          name = "Evan Reichard";
           email = "evan@reichard.io";
         };
         core = {
@@ -73,6 +63,16 @@ in
           autoSetupRemote = true;
         };
       };
+      includes = [
+        {
+          path = "~/.config/git/work";
+          condition = "gitdir:~/Development/git/work/";
+        }
+        {
+          path = "~/.config/git/personal";
+          condition = "gitdir:~/Development/git/personal/";
+        }
+      ];
     };
 
     programs.gh = {
@@ -83,7 +83,7 @@ in
     };
 
     home.packages = with pkgs; [
-      gitAndTools.gh
+      gh
       pre-commit
     ];