Remove unused aliases + better config

modules/git.nix

@@ -6,15 +6,11 @@ let
     "g" = "git";
     "ga" = "git add";
     "gaa" = "git add --all";
-    # "gapa"="git add --patch";
     "gau" = "git add --update";
     "gav" = "git add --verbose";
-    # "gap"="git apply";
-    # "gapt"="git apply --3way";
     "gb" = "git branch";
     "gba" = "git branch -a";
     "gbd" = "git branch -d";
-    # "gbda"="git branch --no-color --merged \| command grep -vE"^(\+\|\*\|\s*($(git_main_branch)\|development\|develop\|devel\|dev)\s*$)"\| command xargs -n 1 git branch -d";
     "gbD" = "git branch -D";
     "gbl" = "git blame -b -w";
     "gbnm" = "git branch --no-merged";
@@ -31,80 +27,35 @@ let
     "gca!" = "git commit -v -a --amend";
     "gcan!" = "git commit -v -a --no-edit --amend";
     "gcans!" = "git commit -v -a -s --no-edit --amend";
-    # "gcam"="git commit -a -m";
     "gcas" = "git commit -a -s";
-    # "gcasm"="git commit -a -s -m";
-    # "gcsm"="git commit -s -m";
     "gcb" = "git checkout -b";
-    # "gcf"="git config --list";
     "gcl" = "git clone --recurse-submodules";
     "gclean" = "git clean -id";
     "gpristine" = "git reset --hard && git clean -dffx";
-    # "gcm"="git checkout $(git_main_branch)";
-    # "gcd"="git checkout develop";
-    # "gcmsg"="git commit -m";
     "gco" = "git checkout";
     "gcount" = "git shortlog -sn";
     "gcp" = "git cherry-pick";
     "gcpa" = "git cherry-pick --abort";
     "gcpc" = "git cherry-pick --continue";
-    # "gcs"="git commit -S";
     "gd" = "git diff";
     "gdca" = "git diff --cached";
     "gdcw" = "git diff --cached --word-diff";
     "gdct" = "git describe --tags $(git rev-list --tags --max-count=1)";
     "gds" = "git diff --staged";
     "gdt" = "git diff-tree --no-commit-id --name-only -r";
-    # "gdnolock"="git diff $@":(exclude)package-lock.json"":(exclude)*.lock"";
-    # "gdv"="git diff -w $@ \| view -";
     "gdw" = "git diff --word-diff";
     "gf" = "git fetch";
     "gfa" = "git fetch --all --prune";
     "gfg" = "git ls-files \| grep";
-    # "gfo"="git fetch origin";
-    # "gg"="git gui citool";
-    # "gga"="git gui citool --amend";
-    # "ggf"="git push --force origin $(current_branch)";
-    # "ggfl"="git push --force-with-lease origin $(current_branch)";
-    # "ggl"="git pull origin $(current_branch)";
-    # "ggp"="git push origin $(current_branch)";
-    # "ggpnp"="ggl && ggp";
-    # "ggpull"="git pull origin"$(git_current_branch)"";
-    # "ggpur"="ggu";
-    # "ggpush"="git push origin"$(git_current_branch)"";
-    # "ggsup"="git branch --set-upstream-to=origin/$(git_current_branch)";
-    # "ggu"="git pull --rebase origin $(current_branch)";
-    # "gpsup"="git push --set-upstream origin $(git_current_branch)";
-    # "ghh"="git help";
-    # "gignore"="git update-index --assume-unchanged";
     "gignored" = ''git ls-files -v \| grep"^[[ :lower: ]]"'';
-    # "git-svn-dcommit-push"="git svn dcommit && git push github $(git_main_branch):svntrunk";
-    # "gk"="gitk --all --branches";
-    # "gke"="gitk --all $(git log -g --pretty=%h)";
-    # "gl"="git pull";
-    # "glg"="git log --stat";
-    # "glgp"="git log --stat -p";
-    # "glgg"="git log --graph";
-    # "glgga"="git log --graph --decorate --all";
-    # "glgm"="git log --graph --max-count=10";
     "glo" = "git log --oneline --decorate";
-    # "glol"="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'";
     "glols" = "git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --stat";
-    # "glod"="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset'";
-    # "glods"="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset' --date=short";
     "glola" = "git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --all";
     "glog" = "git log --oneline --decorate --graph";
     "gloga" = "git log --oneline --decorate --graph --all";
-    # "glp"="git log --pretty=\<format\>";
     "gm" = "git merge";
-    # "gmom"="git merge origin/$(git_main_branch)";
-    # "gmt"="git mergetool --no-prompt";
-    # "gmtvim"="git mergetool --no-prompt --tool=vimdiff";
-    # "gmum"="git merge upstream/$(git_main_branch)";
     "gma" = "git merge --abort";
     "gp" = "git push";
-    # "gpd"="git push --dry-run";
-    # "gpf"="git push --force-with-lease";
     "gpf!" = "git push --force";
     "gpoat" = "git push origin --all && git push origin --tags";
     "gpu" = "git push upstream";
@@ -114,33 +65,14 @@ let
     "grb" = "git rebase";
     "grba" = "git rebase --abort";
     "grbc" = "git rebase --continue";
-    # "grbd"="git rebase develop";
     "grbi" = "git rebase -i";
-    # "grbm"="git rebase $(git_main_branch)";
-    # "grbo"="git rebase --onto";
-    # "grbs"="git rebase --skip";
     "grev" = "git revert";
     "grh" = "git reset";
     "grhh" = "git reset --hard";
-    # "groh"="git reset origin/$(git_current_branch) --hard";
     "grm" = "git rm";
     "grmc" = "git rm --cached";
-    # "grmv"="git remote rename";
-    # "grrm"="git remote remove";
     "grs" = "git restore";
-    # "grset"="git remote set-url";
-    # "grss"="git restore --source";
-    # "grst"="git restore --staged";
-    # "grt"="cd"$(git rev-parse --show-toplevel \|\| echo .)"";
-    # "gru"="git reset --";
-    # "grup"="git remote update";
     "grv" = "git remote -v";
-    # "gsb"="git status -sb";
-    # "gsd"="git svn dcommit";
-    # "gsh"="git show";
-    # "gsi"="git submodule init";
-    # "gsps"="git show --pretty=short --show-signature";
-    # "gsr"="git svn rebase";
     "gss" = "git status -s";
     "gst" = "git status";
     "gsta" = "git stash push";
@@ -151,28 +83,8 @@ let
     "gstl" = "git stash list";
     "gstp" = "git stash pop";
     "gsts" = "git stash show --text";
-    # "gstu"="git stash --include-untracked";
-    # "gstall"="git stash --all";
-    # "gsu"="git submodule update";
-    # "gsw"="git switch";
-    # "gswc"="git switch -c";
-    # "gts"="git tag -s";
-    # "gtv"="git tag \| sort -V";
-    # "gtl"="gtl(){ git tag --sort=-v:refname -n -l ${1}* }; noglob gtl";
-    # "gunignore"="git update-index --no-assume-unchanged";
-    # "gunwip"="git log -n 1 \| grep -q -c"\-\-wip\-\-"&& git reset HEAD~1";
     "gup" = "git pull --rebase";
     "gupv" = "git pull --rebase -v";
-    # "gupa"="git pull --rebase --autostash";
-    # "gupav"="git pull --rebase --autostash -v";
-    # "glum"="git pull upstream $(git_main_branch)";
-    # "gwch"="git whatchanged -p --abbrev-commit --pretty=medium";
-    # "gwip"="git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify --no-gpg-sign -m"--wip-- [skip ci]"";
-    # "gam"="git am";
-    # "gamc"="git am --continue";
-    # "gams"="git am --skip";
-    # "gama"="git am --abort";
-    # "gamscp"="git am --show-current-patch";
   };
 in
 {
@@ -190,8 +102,8 @@ in
       diff.guitool = meld;
       merge.guitool = meld;
       pull.rebase = true;
-      rebase.autostash = true;
+      rebase.autoStash = true;
-      init.defaultBranch = "master";
+      init.defaultBranch = "main";
     };
     lfs.enable = true;
     delta.enable = true;