From eb0aa69bf69a687843faa9c2e24d58a509bee3f2 Mon Sep 17 00:00:00 2001 From: Hendrik Jäger Date: Tue, 5 Apr 2022 11:45:57 +0200 Subject: refactor plugin loading --- .zsh_zinit | 31 ------------------------------- .zshrc | 35 +++++++++++++++++++++++++++++++---- 2 files changed, 31 insertions(+), 35 deletions(-) delete mode 100644 .zsh_zinit diff --git a/.zsh_zinit b/.zsh_zinit deleted file mode 100644 index e35457b..0000000 --- a/.zsh_zinit +++ /dev/null @@ -1,31 +0,0 @@ -source ~/Data/public/software/zinit/zinit.zsh - -# 'ice wait' prevents the rest of my config from loading!? -# zinit ice wait'!0' -zinit load 'https://github.com/willghatch/zsh-saneopt' - -# zinit ice wait'!0' -zinit load 'https://github.com/joel-porquet/zsh-dircolors-solarized' - -# zinit load 'https://github.com/MikeDacre/tmux-zsh-vim-titles' - -# zinit ice wait'!0' -zinit load 'https://github.com/nojhan/liquidprompt' - -# zinit ice wait'!0' -zinit load 'https://github.com/laurenkt/zsh-vimto' - -# zinit ice wait'!0' -zinit load 'https://github.com/MichaelAquilina/zsh-you-should-use' - -# zinit load 'https://github.com/desyncr/auto-ls' - -# zinit ice wait'!0' -zinit load 'https://github.com/zsh-users/zsh-completions' - -# zinit ice wait'!0' -zinit load "https://github.com/greymd/tmux-xpanes" - -# zinit ice wait'!0' -zinit load 'https://github.com/zsh-users/zsh-syntax-highlighting' - diff --git a/.zshrc b/.zshrc index a801df5..b182e0a 100644 --- a/.zshrc +++ b/.zshrc @@ -54,6 +54,18 @@ source ~/.zsh_aliases source ~/.zsh_qemu +# load plugin manager after all 'static' stuff is done +source ~/Data/public/software/zinit/zinit.zsh + + +# mostly static stuff, env vars +zinit load 'https://github.com/joel-porquet/zsh-dircolors-solarized' +zinit load "https://github.com/greymd/tmux-xpanes" + + +# load sane options plugin before setting my own options +zinit load 'https://github.com/willghatch/zsh-saneopt' + # options are usually independent and standalone # so they can stay at the top setopt AUTO_CD @@ -93,14 +105,13 @@ setopt NO_BG_NICE #setopt LONG_LIST_JOBS +# load before completion system initialization +zinit load 'https://github.com/zsh-users/zsh-completions' + # initialize completion system before loading plugins and external configs source ~/.zsh_comprc -# TODO break this up -source ~/.zsh_zinit - - # TODO reconsider this # source /usr/share/autojump/autojump.sh @@ -125,6 +136,13 @@ bindkey -M vicmd '^X^E' edit-command-line bindkey -M viins '^X^E' edit-command-line +#this mainly sets vars, binds keys, does zle stuff +zinit load 'https://github.com/laurenkt/zsh-vimto' + +# functions and an autoload, should be fine here +zinit load 'https://github.com/MichaelAquilina/zsh-you-should-use' + + # source ~/.zsh_taskwarrior # source ~/.zsh_functions # source ~/.zsh_functions_media @@ -148,6 +166,15 @@ typeset -U path # so they go more to the bottom +# should probably be closer to the bottom than the top? +zinit load 'https://github.com/nojhan/liquidprompt' + + +# needs to be loaded close to the end because it hooks into other stuff +# see https://github.com/zsh-users/zsh-syntax-highlighting +zinit load 'https://github.com/zsh-users/zsh-syntax-highlighting' + + # commands to run after initialization is complete #task awaiting cat ~/.motd -- cgit v1.2.3