From 391e01b647cbc4aac1da4c1da31aaa05c2e145e9 Mon Sep 17 00:00:00 2001 From: Dmytro Meleshko Date: Tue, 11 May 2021 10:56:02 +0300 Subject: [PATCH 1/2] [zsh] get rid of some useless things --- .gitignore | 1 + zsh/.gitignore | 1 - zsh/zshrc | 2 -- 3 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 zsh/.gitignore diff --git a/.gitignore b/.gitignore index 0e47e03..85f3c76 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ *.pyc node_modules/ +*.md.html diff --git a/zsh/.gitignore b/zsh/.gitignore deleted file mode 100644 index 95cb55a..0000000 --- a/zsh/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/custom/ diff --git a/zsh/zshrc b/zsh/zshrc index ea8cb05..8961f85 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -52,8 +52,6 @@ for script in functions options path env plugins aliases completion zle prompt c _perf_timer_stop "$script.zsh" done -command_exists rbenv && eval "$(rbenv init -)" - _perf_timer_stop "total" welcome From 39c393822da986285a06de45df33efd2c8b286fd Mon Sep 17 00:00:00 2001 From: Dmytro Meleshko Date: Tue, 11 May 2021 10:56:53 +0300 Subject: [PATCH 2/2] [zsh] load zplg from the main entry script --- zsh/options.zsh | 3 +++ zsh/plugins.zsh | 7 +------ zsh/zshrc | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/zsh/options.zsh b/zsh/options.zsh index 3679194..f71f718 100644 --- a/zsh/options.zsh +++ b/zsh/options.zsh @@ -58,3 +58,6 @@ 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 dd62b51..73f3045 100644 --- a/zsh/plugins.zsh +++ b/zsh/plugins.zsh @@ -1,11 +1,6 @@ #!/usr/bin/env zsh -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" +mkdir -pv "$ZSH_CACHE_DIR" _plugin() { _perf_timer_start "plugin $1" diff --git a/zsh/zshrc b/zsh/zshrc index 8961f85..ae1c1c7 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -46,7 +46,7 @@ _perf_timer_start "total" fi # }}} -for script in functions options path env plugins aliases completion zle prompt colorscheme; do +for script in functions options path env zplg plugins aliases completion zle prompt colorscheme; do _perf_timer_start "$script.zsh" source "$ZSH_DOTFILES/$script.zsh" _perf_timer_stop "$script.zsh"