Cut out the BS

The prompt was big, unruly, and slow. I only used a subset of the
functionality which I originally coded into it, but that bulk was
unnecessary for a mostly personal project like this one.

diff --git a/README.md b/README.md
index 4703ae876ff1223172463bd2239d78e2b1e5aa56..e56168ebc4e98af799927283d6314ba42e2717a8 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,8 +1,6 @@
 # admone
 A tolerable Zsh prompt
 
-![Screenshot](branding/screenshot.png)
-
 ## Installation
 Source this script somewhere in your Zshrc. Theoretically works with plugin managers as well, although this is untested
 
@@ -12,7 +10,6 @@ Configuration is done by modifying the variables set at the start of the script.
 ## My design requirements
   - No dependency on OhMyZSH
   - Quick to load
-  - 2 lines (if wanted)
   - Git integration
   - Easily extensible
   - Bracketed sections
@@ -26,6 +23,4 @@ admonish, remind, prompt; suggest, advise, raise; persuade, urge; warn, caution
 ```
 
 ## License
-Admone is MIT licensed by [Armaan Bhojwani](https://armaanb.net)
-
-Heavily inspired by [Pierre-Albéric TROUPLIN's prompt](https://github.com/palb91/dotfiles/blob/master/zsh/conf.d/00_prompt.zsh), [this gist by romkatv](https://gist.github.com/romkatv/2a107ef9314f0d5f76563725b42f7cab), and [this comment by romkatv](https://github.com/romkatv/powerlevel10k/issues/888#issuecomment-657969840)
+Admone is MIT licensed by [Armaan Bhojwani](https://armaanb.net), 2021.

diff --git a/admone.zsh b/admone.zsh
index 8f13a010b526453a85590dcfa7eae7bdeff6811f..739e78f0fb819b591e1dd63b3c014ee57fdcbf69 100644 (file)
--- a/admone.zsh
+++ b/admone.zsh
@@ -2,67 +2,14 @@
 # Copyright Armaan Bhojwani 2021 <me@armaanb.net>
 # MIT licensed, see the LICENSE file for more information.
 
-#######################################################################
-# USER CONFIGURATIONS
-#######################################################################
-
 PROMPT_CHAR="➤"
-  # PROMPT_CHAR="❯❯❯"
-  # PROMPT_CHAR="$"
-  # PROMPT_CHAR="%"
-  # PROMPT_CHAR=">"
-  # PROMPT_CHAR="➢"
-  # PROMPT_CHAR="➪"
-PRE_UPPER="╭"
-PRE_LOWER="╰"
-  # PRE_UPPER="┌"
-  # PRE_LOWER="└"
-BLOCK_SEPARATOR="─"
-  # BLOCK_SEPARATOR="∙"
-BLOCK_LEFT="["
-BLOCK_RIGHT="]"
-  # BLOCK_LEFT="("
-  # BLOCK_RIGHT=")"
-SHOW_0_EXIT_CODE="1"
-INCLUDE="admone-pwd;admone-vcs;admone-exit-code"
-FORMAT_LOWER="%B%F{%(?.cyan.red)}"
-
-SHORT_PROMPT="➤"
-FORMAT_SHORT="%B%F{%(?.cyan.red)}"
-TWO_LINE="0"
 
 zstyle ':vcs_info:git:*' formats '%b%u%c'
 zstyle ':vcs_info:git:*' actionformats '%b|%a%u%c'
 zstyle ':vcs_info:*' unstagedstr ' *'
 zstyle ':vcs_info:*' stagedstr ' +'
 
-#######################################################################
-# Functions
-#######################################################################
-
-admone-pwd() {
-  echo "%F{blue}%~%f"
-}
-admone-vcs() {
-  echo "%F{green}${vcs_info_msg_0_}%f"
-}
-admone-exit-code() {
-  ([[ $SHOW_0_EXIT_CODE == "1" ]] && echo "%(?,%F{cyan}%?%f,%F{red}%?%f)") ||
-    echo "%(?,,%F{red}%?%f)"
-}
-admone-date() {
-  echo $(date -I)
-}
-admone-12hr() {
-  echo $(date +%r)
-}
-admone-24hr() {
-  echo $(date +%T)
-}
-
-#######################################################################
-# BACKEND
-#######################################################################
+################################################################################
 
 # Cursor shape depends on vi mode
 function zle-keymap-select zle-line-init zle-line-finish {
@@ -76,58 +23,23 @@ function zle-keymap-select zle-line-init zle-line-finish {
       print -n -- "\E]50;CursorShape=1\C-G"
       ;;
   esac
-  zle reset-prompt
+  # zle reset-prompt
   zle -R
 }
 
-set-twoline-prompt() {
-  # Reset prompts
-  upper="${PRE_UPPER}"
-  lower="${PRE_LOWER}${FORMAT_LOWER}${PROMPT_CHAR}%f%b "
-
-  # Add in functions as defined above
-  upper+="${BLOCK_LEFT}$($THE_COMMAND)${BLOCK_RIGHT}"
-
-  for (( i = 0; i < $NUM_FUNCS; i++ )); do
-    THE_COMMAND="$(echo $INCLUDE | cut -d ';' -f $(($i + 2)))"
-    upper+="${BLOCK_SEPARATOR}${BLOCK_LEFT}$(${THE_COMMAND})${BLOCK_RIGHT}"
-  done
-
-  # Add line above
-  PROMPT=${upper}$'\n'${lower}
-}
-
-set-oneline-prompt() {
-  PROMPT="${FORMAT_LOWER}${PROMPT_CHAR}%f%b "
-  RPROMPT=""
-
-  for (( i = 0; i <= $NUM_FUNCS; i++ )); do
-    THE_COMMAND="$(echo $INCLUDE | cut -d ';' -f $(($i + 1)))"
-    RPROMPT+="${BLOCK_LEFT}$($THE_COMMAND)${BLOCK_RIGHT}"
-  done
-}
-
 # Set everything!
 set-prompt() {
-  NUM_FUNCS="$(echo $INCLUDE | grep -o ';' | wc -l)"
-  THE_COMMAND="$(echo $INCLUDE | cut -d ';' -f 1)"
-
-  if [[ $TWO_LINE == "1" ]]; then
-    set-twoline-prompt
-  else
-    set-oneline-prompt
-  fi
+  PROMPT="%B%F{%(?.cyan.red)}${PROMPT_CHAR}%f%b "
+  RPROMPT="[%F{blue}%~%f]"
+  RPROMPT+="[%F{green}${vcs_info_msg_0_}%f]"
+  RPROMPT+="[%(?,%F{cyan}%?%f,%F{red}%?%f)]"
 
   [[ -v PS1_NL ]] && echo || PS1_NL=
 }
 
-if [[ ! $(echo $INCLUDE | grep -q "vcs") ]]; then
-  zstyle ':vcs_info:*' check-for-changes true
-  autoload -Uz add-zsh-hook vcs-info
-  add-zsh-hook precmd vcs_info
-fi
-
-autoload -Uz add-zsh-hook
+zstyle ':vcs_info:*' check-for-changes true
+autoload -Uz add-zsh-hook vcs-info
+add-zsh-hook precmd vcs_info
 add-zsh-hook precmd set-prompt
 
 zle -N zle-line-init

diff --git a/branding/logo.png b/branding/logo.png
deleted file mode 100644 (file)
index ea4fddd..0000000
Binary files a/branding/logo.png and /dev/null differ

diff --git a/branding/logo.xcf b/branding/logo.xcf
deleted file mode 100644 (file)
index 9c4eae7..0000000
Binary files a/branding/logo.xcf and /dev/null differ

diff --git a/branding/screenshot.png b/branding/screenshot.png
deleted file mode 100644 (file)
index 85172b6..0000000
Binary files a/branding/screenshot.png and /dev/null differ