From 127d027598669cd780cf03e64150461007e865e2 Mon Sep 17 00:00:00 2001
From: Fred Klassen <fred.klassen@broadcom.com>
Date: Mon, 20 Feb 2023 19:11:03 -0800
Subject: [PATCH] VSCode buster support, remove duplicate aliases

---
 templates/zshrc.zsh-template | 32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 2a1567fd8..d8627098d 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -126,19 +126,23 @@ plugins=(
 # Linux only optional plugins
 case "$(uname)" in
 Linux) plugins+=(
-    debian
-    systemd
-  )
-  ;;
+         debian
+         systemd
+       )
+       # fix for VS Code not redering on Debian Buster
+       [ "$(lsb_release -sc)" = buster ] && alias code='code --disable-gpu'
+       ;;
 esac
 
 # macOS only optional plugins
 case "$(uname)" in
 Darwin) plugins+=(
-    brew
-    forklift  # requires ForkLift from App Store
-  )
-  ;;
+          brew
+          forklift  # requires ForkLift from App Store
+        )
+        # Homebrew upgrade packages (macOS only)
+       alias brewu='brew update && brew upgrade && brew cleanup && brew doctor'
+       ;;
 esac
 
 # non-Windows optional plugins
@@ -187,18 +191,8 @@ export MANPATH="/usr/local/man:/usr/local/ssl/share/man:$MANPATH"
 # Example aliases
 # alias zshconfig="mate ~/.zshrc"
 # alias ohmyzsh="mate ~/.oh-my-zsh"
-alias gld="git log --pretty=format:'%C(yellow)%h%C(reset) - %an [%C(green)%ar%C(reset)] %s'"
-alias glsi='git ls-files --other --ignored --exclude-standard'
-alias galiases='git config -l | grep alias | cut -c 7-'
-gls='git log --stat --decorate --source -p'
-alias glhistg="git log --graph --pretty=format:'%C(yellow)%h%C(bold white red)%d%Creset %s %C(bold green)%cr %Creset%C(white)%an' --abbrev-commit --date=relative"
-alias gdmb='git branch --merged | grep -v "\*" | xargs -n 1 git branch -d'
 alias gnb='git nb' # new branch aka checkout -b
-alias gdtree='git diff-tree'
-alias gdt='git difftool'
-alias gmt='git mergetool'
-# Homebrew upgrade packages (macOS only)
-alias brewu='brew update && brew upgrade && brew cleanup && brew doctor'
+alias gdtl='git difftool --no-prompt'
 
 # Other custom config
 [ -f /usr/local/etc/profile.d/autojump.sh ] && . /usr/local/etc/profile.d/autojump.sh