modules/home-manager/cli/git/default.nix

@@ -22,33 +22,9 @@ in
   config = mkIf cfg.enable {
     programs.git = {
       enable = true;
-      delta = {
-        enable = true;
-        options = {
-          dark = true;
-          line-numbers = true;
-          syntax-theme = "base16-256";
-
-        };
-      };
       package = pkgs.gitFull;
       userName = "${cfg.userName}";
       userEmail = "${cfg.userEmail}";
-      aliases = {
-        fa = "fetch --all";
-        far = "!git fa; git rebase";
-        l = "log --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit";
-        lg = "log --graph --decorate --pretty=oneline --abbrev-commit";
-        pf = "push --force-with-lease";
-        rewrite = "!git commit --amend --no-edit && git push --force-with-lease";
-        st = "status -sb";
-      };
-      extraConfig = {
-         push = {
-          autoSetupRemote = true;
-          default = "current";
-        };
-      };
     };
   };
 }

modules/home-manager/cli/zsh/default.nix

@@ -28,33 +28,28 @@ in
         enable = true;
         highlighters =  [ "brackets" "main" "pattern" ];
         styles = {
-          arithmetic-expansion = "fg=#ba8baf";
           assign = "fg=#7cafc2";
           back-double-quoted-argument = "fg=#7cafc2";
           back-quoted-argument-delimiter = "fg=ba8baf,bold";
           bracket-error = "fg=#ab4642,bold";
-          bracket-level-1 = "fg=#7cafc2";
-          bracket-level-2 = "fg=#ba8baf";
+          bracket-level-1 = "fg=7cafc2";
+          bracket-level-2 = "fg=ba8baf";
           bracket-level-3 = "fg=#a1b56c";
           builtin = "fg=#7cafc2,bold";
           commandseparator = "fg=#f7ca88,bold";
-          cursor-matchingbracket = "bg=#585858,bold";
+          cursor-matchingbracket = "fg=ba8baf,bold";
           dollar-double-quoted-argument = "fg=#86c1b9";
-          dollar-quoted-argument = "fg=#86c1b9";
           double-hyphen-option = "fg=#86c1b9";
           double-quoted-argument-unclosed = "fg=#ab4642,bold";
-          function = "fg=#7cafc2";
+          function = "fg=blue";
           globbing = "fg=#ba8baf";
-          named-fd = "fg=#f7ca88";
-          numeric-fd = "fg=#f7ca88";
-          path = "fg=#dc9656";
+          path = "fg=#f7ca88";
           path_prefix = "fg=#ba8baf";
-          redirection = "fg=#ba8baf,bold";
+          redirection = "fg=#f7ca88,bold";
           reserved-word = "fg=#ba8baf,bold";
           single-hyphen-option = "fg=#86c1b9";
           single-quoted-argument = "fg=#f7ca88";
           single-quoted-argument-unclosed = "fg=#ab4642,bold";
-          unknown-token = "fg=#ab4642,bold";
         };
         patterns = {
           "\\n" = "fg=#7cafc2";