5 files changed, 96 insertions, 106 deletions
diff --git a/zsh/.zlogout b/zsh/.zlogout
deleted file mode 100644
index 33666be..0000000
--- a/zsh/.zlogout
+++ /dev/null
@@ -1 +0,0 @@
-rm -rf /tmp/xorg-awake
diff --git a/zsh/.zprofile b/zsh/.zprofile
deleted file mode 100644
index 1eae5e7..0000000
--- a/zsh/.zprofile
+++ /dev/null
@@ -1,6 +0,0 @@
-#export GDK_DPI_SCALE=0.7
-
-#gnome_schema=org.gnome.desktop.interface
-#
-#gsettings set $gnome_schema gtk-theme 'Plata-Noir-Compact'
-#gsettings set $gnome_schema icon-theme 'Papirus-Dark'
diff --git a/zsh/.zshrc b/zsh/.zshrc
deleted file mode 100644
index 00be912..0000000
--- a/zsh/.zshrc
+++ /dev/null
@@ -1,99 +0,0 @@
-HISTFILE="$ZDOTDIR"/hist
-SAVEHIST=1000
-HISTSIZE=1000
-setopt APPEND_HISTORY
-setopt HIST_FIND_NO_DUPS
-setopt HIST_EXPIRE_DUPS_FIRST
-setopt HIST_VERIFY
-setopt HIST_IGNORE_DUPS
-setopt INC_APPEND_HISTORY
-setopt HIST_REDUCE_BLANKS
-
-_SH="zsh"
-
-if [ -f "$XDG_CONFIG_HOME"/sh/aliases ]; then
-	source "$XDG_CONFIG_HOME"/sh/aliases
-fi
-if [ -f "$XDG_CONFIG_HOME"/sh/functions ]; then
-	source "$XDG_CONFIG_HOME"/sh/functions
-fi
-
-if [ -n "$ZDOTDIR"/.zshrc -a -f "$ZDOTDIR"/.zshrc ]; then
-  alias e='source "$ZDOTDIR"/.zshrc'
-elif [ -f "$HOME"/.zshrc ]; then
-  alias e='source ~/.zshrc'
-fi
-
-bindkey "^?" backward-delete-char
-
-# bindkey -v
-
-if [ "$TERM" = "st-256color" ] || [ "$TERM" = "xterm-256color" ]; then
-  function zle-line-init () { echoti smkx }
-  function zle-line-finish () { echoti rmkx }
-
-  zle -N zle-line-init
-  zle -N zle-line-finish
-fi
-
-unset COLOR1
-ZSHTHEMERC="${ZDOTDIR:-$HOME}/.zsh_theme"
-[ -f "$ZSHTHEMERC" ] && . "$ZSHTHEMERC"
-
-if [ -z "$COLOR1" ]; then
-  case "$(whoami)" in
-    zachir) COLOR1="014" ;;
-    git) COLOR1="013" ;;
-    subsonic) COLOR1="012" ;;
-    *) COLOR1="015" ;;
-  esac
-fi
-
-MYPROMPT='%B%S%F{'"$COLOR1"'}[%n@%m]:%f%s%F{015}%~%f%S%F{'"$COLOR1"'}%#%f%s%b '
-function zle-line-init zle-keymap-select {
-	VIM_PROMPT="%B%F{012}[%n@%m]:%f%F{015}%~%f%F{012}%#%f%b "
-	PS1="${${KEYMAP/vicmd/$VIM_PROMPT}/main/$MYPROMPT}"
-	#PS1="$PROMPT $KEYMAP"
-	zle reset-prompt
-}
-
-unset COLOR1
-
-zle -N zle-line-init
-zle -N zle-keymap-select
-export KEYTIMEOUT=1
-
-fpath+="$ZDOTDIR/zfunc"
-
-autoload -Uz compinit promptinit
-compinit -d $CONFIG/zcompdump
-promptinit
-autoload -Uz up-line-or-beginning-search down-line-or-beginning-search
-zle -N up-line-or-beginning-search
-zle -N down-line-or-beginning-search
-
-zstyle ':completion:*' menu select
-zstyle ':completion::complete:*' gain-privileges 1
-zstyle ':completion:*' rehash true
-
-setopt COMPLETE_ALIASES
-setopt AUTO_CD
-
-typeset -g -A key
-
-key[Up]="${terminfo[kcuu1]}"
-key[Down]="${terminfo[kcud1]}"
-key[Left]="${terminfo[kcub1]}"
-key[Right]="${terminfo[kcuf1]}"
-key[Shift-Tab]="${terminfo[kcbt]}"
-key[Delete]="${terminfo[kdch1]}"
-
-[[ -n "${key[Up]}" ]] && bindkey -- "${key[Up]}"                up-line-or-beginning-search
-bindkey -- '^[[A'                                               up-line-or-beginning-search
-bindkey -- '^[[B'                                               down-line-or-beginning-search
-[[ -n "${key[Down]}" ]] && bindkey -- "${key[Down]}"            down-line-or-beginning-search
-[[ -n "${key[Left]}" ]] && bindkey -- "${key[Left]}"            backward-char
-[[ -n "${key[Right]}" ]] && bindkey -- "${key[Right]}"          forward-char
-[[ -n "${key[Shift-Tab]}" ]] && bindkey -- "${key[Shift-Tab]}"  reverse-menu-complete
-[[ -n "${key[Delete]}" ]] && bindkey -- "${key[Delete]}"        delete-char
-
diff --git a/zsh/.zshenv b/zsh/zshenv
index f02f83a..3719ef4 100644
--- a/zsh/.zshenv
+++ b/zsh/zshenv
@@ -1,5 +1,7 @@
 # ZSH SPECIFIC CONFIGS
 unset HISTFILE
 export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
+export skip_global_compinit=1
+fpath=($XDG_CONFIG_HOME/functions $fpath)
 [ -f /etc/profile ] && . /etc/profile
 [ -f "$XDG_CONFIG_HOME/sh/profile" ] && . "$XDG_CONFIG_HOME/sh/profile"
diff --git a/zsh/zshrc b/zsh/zshrc
new file mode 100644
index 0000000..f8fdac5
--- /dev/null
+++ b/zsh/zshrc
@@ -0,0 +1,94 @@
+#zmodload zsh/zprof
+if [ -n "$ZPLUG_HOME" ]; then
+  if [ -d "$ZPLUG_HOME" ]; then
+    export ZPLUG_INSTALLED="y"
+    source "$ZPLUG_HOME/init.zsh"
+  fi
+elif [ -d "$XDG_DATA_HOME/zplug" ]; then
+  export ZPLUG_INSTALLED="y"
+  source "$XDG_DATA_HOME/zplug/init.zsh"
+elif [ -d "$HOME/.zplug" ]; then
+  export ZPLUG_INSTALLED="y"
+  source "$HOME/.zplug/init.zsh"
+fi
+[ -z "$XDG_CONFIG_HOME" ] && XDG_CONFIG_HOME="$HOME/.config"
+HISTFILE="$XDG_CONFIG_HOME/zsh/hist"
+SAVEHIST=1000
+HISTSIZE=1000
+setopt APPEND_HISTORY
+setopt HIST_FIND_NO_DUPS
+setopt HIST_EXPIRE_DUPS_FIRST
+setopt HIST_VERIFY
+setopt HIST_IGNORE_DUPS
+setopt INC_APPEND_HISTORY
+setopt HIST_REDUCE_BLANKS
+setopt COMPLETE_ALIASES
+setopt AUTO_CD
+
+_SH="zsh"
+
+if [ -f "$XDG_CONFIG_HOME"/sh/aliases ]; then
+  source "$XDG_CONFIG_HOME"/sh/aliases
+fi
+if [ -f "$XDG_CONFIG_HOME"/sh/functions ]; then
+  source "$XDG_CONFIG_HOME"/sh/functions
+fi
+
+if [ -f "$XDG_CONFIG_HOME/zsh/zshrc" ]; then
+  alias e='source "$XDG_CONFIG_HOME/zsh/zshrc"'
+elif [ -f "$XDG_CONFIG_HOME/zshrc" ]; then
+  alias e='source "$XDG_CONFIG_HOME/zshrc"'
+elif [ -f "$HOME"/.zshrc ]; then
+  alias e='source ~/.zshrc'
+fi
+
+source ~/.zkbd/$TERM-${${DISPLAY:t}:-$VENDOR-$OSTYPE}
+
+#autoload zkbd; zkbd
+bindkey -v
+bindkey "${key[Backspace]}" backward-delete-char
+bindkey "${key[Delete]}" delete-char
+bindkey "${key[Home]}" beginning-of-line
+bindkey "${key[End]}" end-of-line
+bindkey "${key[PageUp]}" history-substring-search-up
+bindkey "${key[PageDown]}" history-substring-search-down
+
+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 '
+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 '
+  PS1="${${KEYMAP/vicmd/$VIM_PROMPT}/main/$MYPROMPT}"
+  zle reset-prompt
+}
+
+zle -N zle-line-init
+zle -N zle-keymap-select
+export KEYTIMEOUT=1
+
+fpath+="$XDG_CONFIG_HOME/zsh/zfunc"
+
+if [ -n "$ZPLUG_INSTALLED" ]; then
+  # zsh history substring search
+  zplug "zsh-users/zsh-history-substring-search", as:plugin
+  
+  bindkey "${key[Up]}" history-substring-search-up
+  bindkey "${key[Down]}" history-substring-search-down
+  bindkey -M vicmd "${key[Up]}" history-substring-search-up
+  bindkey -M vicmd "${key[Down]}" history-substring-search-down
+  bindkey -M vicmd "k" history-substring-search-up
+  bindkey -M vicmd "j" history-substring-search-down
+  
+  # zsh syntax highlighting
+  zplug "zsh-users/zsh-syntax-highlighting", defer:2
+  
+  # load zsh plugins
+  zplug load
+fi
+
+autoload -Uz compinit
+compinit -d "$XDG_CACHE_HOME"/zsh/zcompdump-"$ZSH_VERSION"
+
+#zprof