Fix zsh

2023-01-07 16:27:26 +00:00
parent 3469473669
commit 1d0f43a118
5 changed files with 158 additions and 104 deletions
--- a/modules/shell/zsh/.zshrc
+++ b/modules/shell/zsh/.zshrc
@ -1,106 +1,35 @@
-####
-## zsh configuration
-####
+source $ZDOTDIR/config.zsh

-## Environment
-export GPG_TTY=$TTY
+if [ ! -d "$ZGEN_DIR" ]; then
+  echo "Installing jandamm/zgenom"
+  git clone https://github.com/jandamm/zgenom "$ZGEN_DIR"
+fi
+source $ZGEN_DIR/zgenom.zsh

-## Aliases
-source "$ZDOTDIR/aliases.zsh"
+zgenom autoupdate

-## Colors
-autoload -U colors && colors
+if ! zgenom saved; then
+  echo "Initializing zgenom"
+  rm -f $ZDOTDIR/*.zwc(N) \
+        $XDG_CACHE_HOME/zsh/*(N) \
+        $ZGEN_INIT.zwc

-## Completion
-setopt HASH_LIST_ALL
-unsetopt AUTO_NAME_DIRS
-autoload -Uz compinit
-zstyle ':completion:*' menu select
-zmodload zsh/complist
-compinit
-_comp_options+=(globdots) # Include hidden files
+  zgenom load junegunn/fzf shell
+  zgenom load zdharma-continuum/fast-syntax-highlighting
+  zgenom load zsh-users/zsh-completions src
+  zgenom load zsh-users/zsh-autosuggestions
+  zgenom load zsh-users/zsh-history-substring-search
+  zgenom load softmoth/zsh-vim-mode

-## Directories
-setopt AUTO_CD
-setopt AUTO_PUSHD
-setopt CDABLE_VARS
-setopt PUSHD_IGNORE_DUPS
-setopt PUSHD_SILENT
-setopt PUSHD_TO_HOME
+  zgenom save
+  zgenom compile $ZDOTDIR
+fi

-## Expansion and globbing
-setopt EXTENDED_GLOB
-unsetopt GLOB_DOTS
-unsetopt NOMATCH
+## Bootstrap interactive sessions
+if [[ $TERM != dumb ]]; then
+  autoload -Uz compinit && compinit -u -d $ZSH_CACHE/zcompdump

-## History
-setopt APPEND_HISTORY
-setopt BANG_HIST
-setopt EXTENDED_HISTORY
-setopt HIST_IGNORE_ALL_DUPS
-setopt HIST_SAVE_NO_DUPS
-setopt HIST_VERIFY
-setopt INC_APPEND_HISTORY_TIME
-HISTFILE="${XDG_CACHE_HOME:-${HOME}/.cache}/zsh/history"
-HISTSIZE=1000000
-SAVEHIST=1000000
-[[ !( -f "${HISTFILE}" ) ]] && mkdir -p $(dirname ${HISTFILE})
-
-## I/O
-setopt INTERACTIVE_COMMENTS
-setopt MULTIOS
-unsetopt CLOBBER
-
-## Jobs
-setopt LONG_LIST_JOBS
-setopt AUTO_RESUME
-unsetopt BG_NICE
-unsetopt NOTIFY
-unsetopt HUP
-unsetopt CHECK_JOBS
-
-## Shell emulation
-setopt APPEND_CREATE
-
-## Prompt
-PS1="%B%{$fg[magenta]%}%~%{$reset_color%} $%b "
-
-## Vi mode
-bindkey -v
-export KEYTIMEOUT=1
-
-## Zsh line editor
-unsetopt BEEP
-
-
-####
-## Plugins
-####
-
-## Autosuggest
-# source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh 2>/dev/null
-
-# ## History substring search
-# source /usr/share/zsh/plugins/zsh-history-substring-search/zsh-history-substring-search.zsh 2>/dev/null
-# bindkey -M vicmd 'k' history-substring-search-up
-# bindkey -M vicmd 'j' history-substring-search-down
-
-# ## Highlighting
-# source /usr/share/zsh/plugins/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh 2>/dev/null
-
-# ## Enhanced vim mode
-# MODE_INDICATOR=""
-# MODE_CURSOR_VIINS="#b77ee0 blinking bar"
-# MODE_CURSOR_REPLACE="$MODE_CURSOR_VIINS #ff3334"
-# MODE_CURSOR_VICMD="#b77ee0 block"
-# MODE_CURSOR_SEARCH="#e7c547 steady underline"
-# MODE_CURSOR_VISUAL="$MODE_CURSOR_VICMD steady bar"
-# MODE_CURSOR_VLINE="$MODE_CURSOR_VISUAL #54ced6"
-# source /usr/share/zsh/plugins/zsh-vim-mode/zsh-vim-mode.plugin.zsh 2>/dev/null
-
-
-####
-## Keybindings
-####
-stty stop undef
-bindkey -s '^f' 'cd "$(dirname "$(fzf)")"\n'
+  source $ZDOTDIR/keybinds.zsh
+  source $ZDOTDIR/completion.zsh
+  source $ZDOTDIR/aliases.zsh
+fi