Merge remote-tracking branch 'origin/master' into mac

1 files changed, 105 insertions, 0 deletions

diff --git a/zsh/.zshrc b/zsh/.zshrc
new file mode 100644
index 0000000..45123bb
--- /dev/null
+++ b/zsh/.zshrc
@@ -0,0 +1,105 @@
+#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 ~/.config/zsh/.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"
+
+autoload -Uz compinit
+
+alias compinit='compinit -u'
+
+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 
+if [[ -n ${ZDOTDIR}/.zcompdump(#qN.mh+24) ]]; then
+  compinit
+else
+	compinit -C;
+fi;
+
+zstyle ':completion:*' hosts off
+
+#zprof
+export PATH="/opt/homebrew/opt/rustup/bin:$PATH"