Merge branch 'master' into macmac

2 files changed, 10 insertions, 5 deletions

diff --git a/sh/aliases b/sh/aliases
index 93784e7..2e7ecf5 100644
--- a/sh/aliases
+++ b/sh/aliases
@@ -19,10 +19,10 @@ case `uname -s` in
     ;;
   "Linux")
     #alias ls="ls -h $COLOR_FLAGS_GNU"
-    alias ls="eza"
+    type eza >/dev/null && alias ls="eza"
     ;;
   "Darwin")
-    alias ls="eza --color"
+    type eza >/dev/null && alias ls="eza --color"
     ;;
 esac
 alias ll='ls -l'
@@ -44,7 +44,7 @@ case `uname -s` in
     alias rm='rm -i'
     ;;
   "Linux")
-    alias rm='trash-put'
+    type trash-put >/dev/null && alias rm='trash-put'
     ;;
 esac
 alias cp='cp -i'
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 8f6cce7..e3eb235 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -41,13 +41,18 @@ bindkey "${key[End]}" end-of-line
 bindkey "${key[PageUp]}" history-substring-search-up
 bindkey "${key[PageDown]}" history-substring-search-down
 
+[ -f "$ZDOTDIR/.zsh_theme" ] && . "$ZDOTDIR/.zsh_theme"
+COLOR1="${COLOR1:-002}"
+COLOR2="${COLOR2:-006}"
+COLORV="${COLORV:-012}"
+
 if (env | grep -Fq 'DISTROBOX'); then
   MYPROMPT=$'%F{000}%K{004}[%n@%m]%F{013}\UE0B2%K{013}%F{000}%~%F{013}%K{004}\UE0B0%F{000}%#%F{004}%k\UE0B0%f '
 else
-  MYPROMPT=$'%F{000}%K{002}[%n@%m]%F{006}\UE0B2%K{006}%F{000}%~%F{006}%K{002}\UE0B0%F{000}%#%F{002}%k\UE0B0%f '
+  MYPROMPT=$'%F{000}%K{'"$COLOR1"$'}[%n@%m]%F{'"$COLOR2"$'}\UE0B2%K{'"$COLOR2"$'}%F{000}%~%F{'"$COLOR2"$'}%K{'"$COLOR1"$'}\UE0B0%F{000}%#%F{'"$COLOR1"$'}%k\UE0B0%f '
 fi
 function zle-line-init zle-keymap-select {
-  VIM_PROMPT=$'%F{000}%K{012}[%n@%m]%F{006}\UE0B2%K{006}%F{000}%~%F{006}%K{012}\UE0B0%F{000}%#%F{012}%k\UE0B0%f '
+  VIM_PROMPT=$'%F{000}%K{'"$COLORV"$'}[%n@%m]%F{'"$COLOR2"$'}\UE0B2%K{'"$COLOR2"$'}%F{000}%~%F{'"$COLOR2"$'}%K{'"$COLORV"$'}\UE0B0%F{000}%#%F{'"$COLORV"$'}%k\UE0B0%f '
   PS1="${${KEYMAP/vicmd/$VIM_PROMPT}/main/$MYPROMPT}"
   zle reset-prompt
 }