summaryrefslogtreecommitdiff
path: root/zsh
diff options
context:
space:
mode:
Diffstat (limited to 'zsh')
-rw-r--r--zsh/.zshenv (renamed from zsh/zshenv)0
-rw-r--r--zsh/.zshrc122
-rw-r--r--zsh/zshrc96
3 files changed, 122 insertions, 96 deletions
diff --git a/zsh/zshenv b/zsh/.zshenv
index 3719ef4..3719ef4 100644
--- a/zsh/zshenv
+++ b/zsh/.zshenv
diff --git a/zsh/.zshrc b/zsh/.zshrc
new file mode 100644
index 0000000..e08bb20
--- /dev/null
+++ b/zsh/.zshrc
@@ -0,0 +1,122 @@
+#zmodload zsh/zprof
+[ -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
+if [[ -n ${ZDOTDIR}/.zcompdump(#qN.mh+24) ]]; then
+ compinit
+else
+ compinit -C
+fi
+
+zshcache_time="$(date +%s%N)"
+
+autoload -Uz add-zsh-hook
+
+rehash_precmd() {
+ if [[ -a /var/cache/zsh/pacman ]]; then
+ local paccache_time="$(date -r /var/cache/zsh/pacman +%s%N)"
+ if (( zshcache_time < paccache_time )); then
+ rehash
+ zshcache_time="$paccache_time"
+ fi
+ fi
+}
+
+add-zsh-hook -Uz precmd rehash_precmd
+
+zstyle ':completion:*' hosts off
+
+### Added by Zinit's installer
+if [[ ! -f $HOME/.local/share/zinit/zinit.git/zinit.zsh ]]; then
+ print -P "%F{33} %F{220}Installing %F{33}ZDHARMA-CONTINUUM%F{220} Initiative Plugin Manager (%F{33}zdharma-continuum/zinit%F{220})…%f"
+ command mkdir -p "$HOME/.local/share/zinit" && command chmod g-rwX "$HOME/.local/share/zinit"
+ command git clone https://github.com/zdharma-continuum/zinit "$HOME/.local/share/zinit/zinit.git" && \
+ print -P "%F{33} %F{34}Installation successful.%f%b" || \
+ print -P "%F{160} The clone has failed.%f%b"
+fi
+
+source "$HOME/.local/share/zinit/zinit.git/zinit.zsh"
+autoload -Uz _zinit
+(( ${+_comps} )) && _comps[zinit]=_zinit
+
+# Load a few important annexes, without Turbo
+# (this is currently required for annexes)
+zinit light-mode for \
+ zdharma-continuum/zinit-annex-as-monitor \
+ zdharma-continuum/zinit-annex-bin-gem-node \
+ zdharma-continuum/zinit-annex-patch-dl \
+ zdharma-continuum/zinit-annex-rust
+
+### End of Zinit's installer chunk
+zinit snippet OMZ::plugins/git/git.plugin.zsh
+
+zinit load 'zsh-users/zsh-history-substring-search'
+zinit ice wait atload'_history_substring_search_config'
+
+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
+
+source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+
+#zprof
diff --git a/zsh/zshrc b/zsh/zshrc
deleted file mode 100644
index 09a5e32..0000000
--- a/zsh/zshrc
+++ /dev/null
@@ -1,96 +0,0 @@
-#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"
-
-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"
-
-zstyle ':completion:*' hosts off
-
-#zprof
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-22 22:04:27 +0000