diff --git a/config/home-manager.nix b/config/home-manager.nix
index 9dd8fd4..2e7c169 100644
--- a/config/home-manager.nix
+++ b/config/home-manager.nix
@@ -46,8 +46,13 @@ in
     };
     git = {
       enable = true;
+      delta.enable = true;
       userName = "Danilo Reyes";
       userEmail = "CaptainJawZ@protonmail.com";
+      extraConfig = {
+        init.defaultBranch = "main";
+        pull.rebase = true;
+      };
     };
     bash = lib.mkIf (shellType == "bash") {
       enable = true;
diff --git a/config/overlay.nix b/config/overlay.nix
index 4d6849d..687479d 100644
--- a/config/overlay.nix
+++ b/config/overlay.nix
@@ -38,5 +38,11 @@ _final: prev: {
   waybar = prev.waybar.overrideAttrs (old: {
     mesonFlags = old.mesonFlags ++ [ "-Dexperimental=true" ];
   });
-  inherit (pkgsU) symbola mealie flaresolver;
+  inherit (pkgsU)
+    symbola
+    mealie
+    flaresolver
+    nixd
+    nix-statix
+    ;
 }
diff --git a/hosts/workstation/configuration.nix b/hosts/workstation/configuration.nix
index 20a2c27..04a4c83 100644
--- a/hosts/workstation/configuration.nix
+++ b/hosts/workstation/configuration.nix
@@ -164,7 +164,7 @@ in
     };
     sunshine = {
       enable = true;
-      autoStart = true;
+      autoStart = false;
       capSysAdmin = true;
       openFirewall = true;
     };
diff --git a/modules/shell/tools.nix b/modules/shell/tools.nix
index 0730553..345d403 100644
--- a/modules/shell/tools.nix
+++ b/modules/shell/tools.nix
@@ -17,11 +17,45 @@ in
         enable = true;
         package = pkgs.htop-vim;
       };
+      eza = {
+        enable = true;
+        git = true;
+        icons = "auto";
+      };
       zoxide = {
         enable = true;
         enableBashIntegration = shellType == "bash";
         enableZshIntegration = shellType == "zsh";
       };
+      bat = {
+        enable = true;
+        config.pager = "less -FR";
+        extraPackages = builtins.attrValues {
+          inherit (pkgs.bat-extras)
+            batman # man pages
+            batpipe # piping
+            batgrep # ripgrep
+            batdiff # this is getting crazy!
+            batwatch # probably my next best friend
+            prettybat # trans your sourcecode!
+            ;
+        };
+      };
+      password-store = {
+        enable = false;
+        package = pkgs.gopass;
+        settings = {
+          PASSWORD_STORE_AUTOCLIP = "true";
+          PASSWORD_STORE_AUTOIMPORT = "false";
+          PASSWORD_STORE_CLIPTIMEOUT = "45";
+          PASSWORD_STORE_EXPORTKEYS = "false";
+          PASSWORD_STORE_NOPAGER = "false";
+          PASSWORD_STORE_NOTIFICATIONS = "false";
+          PASSWORD_STORE_PARSING = "true";
+          PASSWORD_STORE_PATH = "/home/jawz/.local/share/pass";
+          PASSWORD_STORE_SAFECONTENT = "true";
+        };
+      };
       ${shellType} = {
         shellAliases = {
           cd = "z";
@@ -56,35 +90,6 @@ in
             '';
           }
       );
-      bat = {
-        enable = true;
-        config.pager = "less -FR";
-        extraPackages = builtins.attrValues {
-          inherit (pkgs.bat-extras)
-            batman # man pages
-            batpipe # piping
-            batgrep # ripgrep
-            batdiff # this is getting crazy!
-            batwatch # probably my next best friend
-            prettybat # trans your sourcecode!
-            ;
-        };
-      };
-      password-store = {
-        enable = false;
-        package = pkgs.gopass;
-        settings = {
-          PASSWORD_STORE_AUTOCLIP = "true";
-          PASSWORD_STORE_AUTOIMPORT = "false";
-          PASSWORD_STORE_CLIPTIMEOUT = "45";
-          PASSWORD_STORE_EXPORTKEYS = "false";
-          PASSWORD_STORE_NOPAGER = "false";
-          PASSWORD_STORE_NOTIFICATIONS = "false";
-          PASSWORD_STORE_PARSING = "true";
-          PASSWORD_STORE_PATH = "/home/jawz/.local/share/pass";
-          PASSWORD_STORE_SAFECONTENT = "true";
-        };
-      };
     };
     programs = {
       starship.enable = true;
@@ -99,7 +104,6 @@ in
       inherit (pkgs)
         ripgrep # modern grep
         du-dust # rusty du similar to gdu
-        eza # like ls but with colors
         fd # modern find, faster searches
         fzf # fuzzy finder! super cool and useful
         gdu # disk-space utility checker, somewhat useful