diff --git a/.gitignore b/.gitignore index 349d9a2..5ee376a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ *.pyc node_modules/ -.venv -*.md.html +.venv \ No newline at end of file diff --git a/zsh/options.zsh b/zsh/options.zsh index f71f718..3679194 100644 --- a/zsh/options.zsh +++ b/zsh/options.zsh @@ -58,6 +58,3 @@ setopt hist_verify setopt inc_append_history # synchronize history between active sessions setopt share_history - -# Among other things, used for compatibility with OMZ plugins. -ZSH_CACHE_DIR="${XDG_CACHE_HOME:-$HOME/.cache}/dotfiles" diff --git a/zsh/plugins.zsh b/zsh/plugins.zsh index 1e1a952..f1c9dbe 100644 --- a/zsh/plugins.zsh +++ b/zsh/plugins.zsh @@ -1,6 +1,11 @@ #!/usr/bin/env zsh -mkdir -pv "$ZSH_CACHE_DIR" +ZSH_CACHE_DIR="${XDG_CACHE_HOME:-$HOME/.cache}/dotfiles" +if [[ ! -d "$ZSH_CACHE_DIR" ]]; then + mkdir -pv "$ZSH_CACHE_DIR" +fi + +source "$ZSH_DOTFILES/zplg.zsh" _plugin() { _perf_timer_start "plugin $1" diff --git a/zsh/zshrc b/zsh/zshrc index 55fa9c1..7a099d9 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -46,20 +46,22 @@ _perf_timer_start "total" fi # }}} -for script in functions options path env zplg plugins aliases completion zle prompt colorscheme; do +for script in functions options path env plugins aliases completion zle prompt colorscheme; do _perf_timer_start "$script.zsh" source "$ZSH_DOTFILES/$script.zsh" _perf_timer_stop "$script.zsh" done if [[ -d "$ZSH_DOTFILES/custom" ]]; then - _perf_timer_start "custom scripts" for script in $ZSH_DOTFILES/custom/*.zsh; do + _perf_timer_start "custom/${script##*/}" source "$script" + _perf_timer_stop "custom/${script##*/}" done - _perf_timer_stop "custom scripts" fi +command_exists rbenv && eval "$(rbenv init -)" + _perf_timer_stop "total" welcome