From d2be171f88cfb19a28627729ec6f46708d99726d Mon Sep 17 00:00:00 2001
From: Peter
Date: Sat, 1 Aug 2020 13:55:34 +0100
Subject: Simplify prompt, bit of restructuring

---
 .config/zsh/.zshrc | 68 ++++++++++++++++++------------------------------------
 1 file changed, 22 insertions(+), 46 deletions(-)

diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index 4827507..5926376 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -1,10 +1,24 @@
-# Created by newuser for 5.8
 
+# options
+setopt autocd
+
+# exports
+export DOMAIN=minskio.co.uk
+export EMAIL=$(whoami)@$DOMAIN
+export EXECIGNORE=*vamp*
 export SYNCDIR="$HOME/vault"
 
+# aliases
+alias ls='ls --color=auto'
+alias grep='grep --color=auto'
+alias dotedit='find "$XDG_CONFIG_HOME" -maxdepth 2 -type f | fzf --preview "cat {}" --layout reverse | xargs -r "$EDITOR"'
+alias dotfiles='git --git-dir="$SYNCDIR/src/dotfiles/" --work-tree="$HOME"'
 alias screenoff='sleep 0.5s && xset dpms force off'
-# dotfiles alias: dotfiles config --local status.showUntrackedFiles no
-alias dotfiles='git --git-dir=$SYNCDIR/src/dotfiles/ --work-tree=$HOME'
+
+# functions
+function ytsearch() { mpv "ytdl://ytsearch:\"$1\"" ; }
+
+# bindkeys
 
 # create a zkbd compatible hash;
 # to add other keys to this hash, see: man 5 terminfo
@@ -50,56 +64,20 @@ fi
 bindkey "^[[1;5C" forward-word
 bindkey "^[[1;5D" backward-word
 
-# Oxide theme for Zsh
-#
-# Author: Diki Ananta <diki1aap@gmail.com>
-# Repository: https://github.com/dikiaap/dotfiles
-# License: MIT
-
-# Prompt:
-# %F => Color codes
-# %f => Reset color
-# %~ => Current path
-# %(x.true.false) => Specifies a ternary expression
-#   ! => True if the shell is running with root privileges
-#   ? => True if the exit status of the last command was success
-#
-# Git:
-# %a => Current action (rebase/merge)
-# %b => Current branch
-# %c => Staged changes
-# %u => Unstaged changes
-#
-# Terminal:
-# \n => Newline/Line Feed (LF)
-
+# Oxide theme for Zsh by Diki Ananta <diki1aap@gmail.com>
 setopt PROMPT_SUBST
-
 autoload -U add-zsh-hook
 autoload -Uz vcs_info
-
-# Use True color (24-bit) if available.
-if [[ "${terminfo[colors]}" -ge 256 ]]; then
-    oxide_turquoise="%F{73}"
-    oxide_orange="%F{179}"
-    oxide_red="%F{167}"
-    oxide_limegreen="%F{107}"
-else
-    oxide_turquoise="%F{cyan}"
-    oxide_orange="%F{yellow}"
-    oxide_red="%F{red}"
-    oxide_limegreen="%F{green}"
-fi
-
-# Reset color.
+oxide_turquoise="%F{73}"
+oxide_orange="%F{179}"
+oxide_red="%F{167}"
+oxide_limegreen="%F{107}"
 oxide_reset_color="%f"
-
 # VCS style formats.
 FMT_UNSTAGED="%{$oxide_reset_color%} %{$oxide_orange%}●"
 FMT_STAGED="%{$oxide_reset_color%} %{$oxide_limegreen%}✚"
 FMT_ACTION="(%{$oxide_limegreen%}%a%{$oxide_reset_color%})"
 FMT_VCS_STATUS="on %{$oxide_turquoise%} %b%u%c%{$oxide_reset_color%}"
-
 zstyle ':vcs_info:*' enable git svn
 zstyle ':vcs_info:*' check-for-changes true
 zstyle ':vcs_info:*' unstagedstr    "${FMT_UNSTAGED}"
@@ -108,7 +86,6 @@ zstyle ':vcs_info:*' actionformats  "${FMT_VCS_STATUS} ${FMT_ACTION}"
 zstyle ':vcs_info:*' formats        "${FMT_VCS_STATUS}"
 zstyle ':vcs_info:*' nvcsformats    ""
 zstyle ':vcs_info:git*+set-message:*' hooks git-untracked
-
 # Check for untracked files.
 +vi-git-untracked() {
     if [[ $(git rev-parse --is-inside-work-tree 2> /dev/null) == 'true' ]] && \
@@ -119,6 +96,5 @@ zstyle ':vcs_info:git*+set-message:*' hooks git-untracked
 
 # Executed before each prompt.
 add-zsh-hook precmd vcs_info
-
 # Oxide prompt style.
 PROMPT=$'\n%{$oxide_limegreen%}%~%{$oxide_reset_color%} ${vcs_info_msg_0_}\n%(?.%{%F{white}%}.%{$oxide_red%})%(!.#.❯)%{$oxide_reset_color%} '
-- 
cgit v1.2.3