Add new git-diff and cleanup git aliases

.bashrc

@@ -1,4 +1,3 @@
-
 # Navigation
 #alias ls="ls --color=auto"
 alias ls="exa-0.8.0 --long --header --git --group"
@@ -194,3 +193,7 @@ for filename in ${HOME}/.ssh/*.pub; do
     keyname="$(basename ${filename} .pub)"
     eval $(keychain --nogui --eval --quiet ${keyname})
 done
+
+# Starship Prompt
+# NOTE: This negates the above lines for PS1, kubectl_context, and git_prompt
+eval "$(starship init bash)"

.gitconfig

@@ -1,6 +1,6 @@
 [user]
 	name = Tony Grosinger
-	email = tony@grosinger.net
+	email = tgrosinger@extrahop.com
 [color]
     ui = auto
 
@@ -17,17 +17,16 @@
     amend = commit --amend
     aq = commit --amend --no-edit
     c = commit
-    rv = review -R
     s = status -sb
-    d = diff --color-words --minimal
     b = branch
     pp = log --color --graph --pretty=format:'%Cred%h%Creset %Cgreen(%cr) %Creset\t%s %C(bold blue)<%an> %C(yellow)%d%Creset' --abbrev-commit
-    cr = difftool --dir-diff
     type = cat-file -t
     dump = cat-file -p
-    hist = log --pretty=format:\"%C(yellow)%h %C(blue)%ad %C(red)%d %C(reset)%s %C(green)[%an]\" --decorate --graph --date=short --all
+    hist = log --pretty=format:\"%C(yellow)%h %C(blue)%cd %C(red)%d %C(reset)%s %C(green)[%an]\" --decorate --graph --date=short --all
     ri = "!f() { r=\"${1}\"; if [ \"${1}\" -eq \"${1}\" ]; then r=\"@~${1}\"; \
                  fi >/dev/null 2>&1; git rebase --autosquash -i \"${r}\"; }; f"
+    patch = !git --no-pager diff --no-color
+    diff = diff-so-fancy | less --tabs=4 -RFXS --pattern '^(Date|added|deleted|modified): '
 
 [push]
     default = simple
@@ -35,13 +34,13 @@
 [core]
     editor = vim
     excludesfile = /home/tgrosinger/.gitignore_global
-    pager = bash -lc 'diff-highlight | less -F -R -X -x1,5' -
+    pager = diff-so-fancy | less --tabs=4 -RFX
 
 [diff]
     tool = meld
     renames = copies
     compactionHeuristic = 1
-	submodule = log
+    submodule = log
 
 [branch]
     autosetuprebase = always
@@ -50,6 +49,7 @@
     rebase = true
 
 [log]
-	date = local
+    date = local
+
 [status]
-	submoduleSummary = true
+    submoduleSummary = true

.vimrc

@@ -153,7 +153,8 @@ let g:go_auto_type_info = 0
 let g:go_fmt_command = "goimports"
 let g:go_metalinter_autosave = 1
 let g:go_metalinter_autosave_enabled = ['vet', 'golint', 'errcheck', 'varcheck']
-let g:go_metalinter_enabled = ['vet', 'golint', 'errcheck', 'varcheck', 'aligncheck', 'ineffassign', 'gosimple', 'staticcheck']
+let g:go_metalinter_enabled = ['vet', 'golint', 'errcheck', 'varcheck', 'ineffassign', 'megacheck', 'interfacer', 'maligned']
+"let g:go_metalinter_enabled = ['vet', 'golint', 'errcheck', 'varcheck', 'aligncheck', 'ineffassign', 'gosimple', 'staticcheck', 'interfacer', 'maligned']
 let g:go_metalinter_deadline = '20s'
 
 

install.sh

@@ -86,6 +86,7 @@ function performSetup() {
     linkFile "bin/diff-highlight"
     linkFile "bin/exa-0.8.0"
     linkFile "bin/bat-0.10.0"
+    linkFile "bin/diff-so-fancy"
 
     echo "Installing tmux plugins"
     git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm