From cf506a4b8e1c455909d625d3a64b9ba35c0c2d1f Mon Sep 17 00:00:00 2001
From: Hunt <lizhunt@amazon.com>
Date: Thu, 12 Jun 2025 10:52:25 -0700
Subject: Make global work aliases

---
 dots/zsh/.config/zsh/osx/work.zsh         | 19 --------
 dots/zsh/.config/zsh/setup/aliases.zsh    | 55 ----------------------
 dots/zsh/.config/zsh/setup/aliases.zsh.j2 | 78 +++++++++++++++++++++++++++++++
 3 files changed, 78 insertions(+), 74 deletions(-)
 delete mode 100755 dots/zsh/.config/zsh/setup/aliases.zsh
 create mode 100755 dots/zsh/.config/zsh/setup/aliases.zsh.j2

diff --git a/dots/zsh/.config/zsh/osx/work.zsh b/dots/zsh/.config/zsh/osx/work.zsh
index 4edd8e8..fccbccd 100755
--- a/dots/zsh/.config/zsh/osx/work.zsh
+++ b/dots/zsh/.config/zsh/osx/work.zsh
@@ -1,24 +1,5 @@
 #!/bin/zsh
 
 #-- <amzn> --
-# bb ...
-alias bb='brazil-build'
-alias bba='brazil-build apollo-pkg'
-alias bre='brazil-runtime-exec'
-alias brc='brazil-recursive-cmd'
-alias bws='brazil ws'
-alias bwsuse='bws use --gitMode -p'
-alias bwscreate='bws create -n'
-alias brc=brazil-recursive-cmd
-alias bbr='brc brazil-build'
-alias bball='brc --allPackages'
-alias bbb='brc --allPackages brazil-build'
-alias bbra='bbr apollo-pkg'
-alias bbcr='bb && cr'
-alias brazil-recursive-cmd='brazil-recursive-cmd-parallel'
-
-# run java repl with class path of package! :D
-alias jshell='jshell --class-path "`brazil-path build.classpath`:`brazil-path run.classpath`"'
-
 # [[ -f "${HOME}/Library/Application Support/amazon-q/shell/zshrc.post.zsh" ]] && builtin source "${HOME}/Library/Application Support/amazon-q/shell/zshrc.post.zsh"
 #-- </amzn> --
diff --git a/dots/zsh/.config/zsh/setup/aliases.zsh b/dots/zsh/.config/zsh/setup/aliases.zsh
deleted file mode 100755
index abc4135..0000000
--- a/dots/zsh/.config/zsh/setup/aliases.zsh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/sh
-
-#-- <git> --
-alias gc="git checkout"
-alias gcb="git checkout -b"
-alias gcm="git commit -m"
-alias ga="git add"
-alias gaa="git add ."
-alias gpl="git pull"
-alias gps="git push"
-alias gr="git rebase"
-alias gss="git status"
-alias gsa="git stash"
-alias gsr="git stash pop"
-alias gl="git log --oneline"
-#-- </git> --
-
-#-- <misc> --
-alias fuckuctl="journalctl --user -fu"
-alias fuckctl="journalctl -fu"
-
-alias ..="cd .."
-#-- </misc> --
-
-#-- <neovim> --
-alias vim="nvim"
-#-- </neovim> --
-
-#-- <prev> --
-l() {
-  local cmd args=""
-  local pre=""
-  local replace_args=false
-
-  # Find the last command that is NOT 'l'
-  cmd=$(fc -ln -100 | grep -vE '^\s*l(\s|$)' | tail -n 1)
-
-  for arg in "$@"; do
-    if [[ "$replace_args" == true ]]; then
-      args+=" $arg"
-    fi
-
-    if [[ "$arg" == "su" ]]; then
-      pre="sudo "
-    fi
-
-    if [[ "$arg" == "ra" ]]; then
-      cmd=$(echo "$cmd" | awk '{print $1}')
-      replace_args=true
-    fi
-  done
-
-  eval "${pre}${cmd} ${args}"
-}
-#-- </prev> --
diff --git a/dots/zsh/.config/zsh/setup/aliases.zsh.j2 b/dots/zsh/.config/zsh/setup/aliases.zsh.j2
new file mode 100755
index 0000000..096717a
--- /dev/null
+++ b/dots/zsh/.config/zsh/setup/aliases.zsh.j2
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+#-- <git> --
+alias gc="git checkout"
+alias gcb="git checkout -b"
+alias gcm="git commit -m"
+alias ga="git add"
+alias gaa="git add ."
+alias gpl="git pull"
+alias gps="git push"
+alias gr="git rebase"
+alias gss="git status"
+alias gsa="git stash"
+alias gsr="git stash pop"
+alias gl="git log --oneline"
+#-- </git> --
+
+#-- <misc> --
+alias fuckuctl="journalctl --user -fu"
+alias fuckctl="journalctl -fu"
+
+alias ..="cd .."
+#-- </misc> --
+
+#-- <neovim> --
+alias vim="nvim"
+#-- </neovim> --
+
+#-- <prev> --
+l() {
+  local cmd args=""
+  local pre=""
+  local replace_args=false
+
+  # Find the last command that is NOT 'l'
+  cmd=$(fc -ln -100 | grep -vE '^\s*l(\s|$)' | tail -n 1)
+
+  for arg in "$@"; do
+    if [[ "$replace_args" == true ]]; then
+      args+=" $arg"
+    fi
+
+    if [[ "$arg" == "su" ]]; then
+      pre="sudo "
+    fi
+
+    if [[ "$arg" == "ra" ]]; then
+      cmd=$(echo "$cmd" | awk '{print $1}')
+      replace_args=true
+    fi
+  done
+
+  eval "${pre}${cmd} ${args}"
+}
+#-- </prev> --
+
+{% if features.work_mode %}
+#-- <work> --
+# bb ..
+alias bb='brazil-build'
+alias bba='brazil-build apollo-pkg'
+alias bre='brazil-runtime-exec'
+alias brc='brazil-recursive-cmd'
+alias bws='brazil ws'
+alias bwsuse='bws use --gitMode -p'
+alias bwscreate='bws create -n'
+alias brc=brazil-recursive-cmd
+alias bbr='brc brazil-build'
+alias bball='brc --allPackages'
+alias bbb='brc --allPackages brazil-build'
+alias bbra='bbr apollo-pkg'
+alias bbcr='bb && cr'
+alias brazil-recursive-cmd='brazil-recursive-cmd-parallel'
+
+# run java repl with class path of package! :D
+alias jshell='jshell --class-path "`brazil-path build.classpath`:`brazil-path run.classpath`"'
+#-- </work> --
+{% endif %}
-- 
cgit v1.2.3-70-g09d2