From 072c3718a1e5bb713f0318ab6a1eb90c5cced5a2 Mon Sep 17 00:00:00 2001 From: Anton Zadvorny Date: Sat, 20 Oct 2018 21:39:31 +0300 Subject: [PATCH] Switch to zplug --- .../custom => .zsh}/themes/cheetah.zsh-theme | 0 home/.zshenv | 2 + home/.zshrc | 46 +++++++++++++++---- 3 files changed, 40 insertions(+), 8 deletions(-) rename home/{.oh-my-zsh/custom => .zsh}/themes/cheetah.zsh-theme (100%) create mode 100644 home/.zshenv diff --git a/home/.oh-my-zsh/custom/themes/cheetah.zsh-theme b/home/.zsh/themes/cheetah.zsh-theme similarity index 100% rename from home/.oh-my-zsh/custom/themes/cheetah.zsh-theme rename to home/.zsh/themes/cheetah.zsh-theme diff --git a/home/.zshenv b/home/.zshenv new file mode 100644 index 0000000..fcb939a --- /dev/null +++ b/home/.zshenv @@ -0,0 +1,2 @@ +export LC_ALL=en_US.UTF-8 +export ASDF_DATA_DIR=~/.asdf diff --git a/home/.zshrc b/home/.zshrc index 423565e..8fec549 100644 --- a/home/.zshrc +++ b/home/.zshrc @@ -1,11 +1,41 @@ -ZSH=$HOME/.oh-my-zsh -ZSH_THEME="cheetah" +[ -s "$HOME/.zshenv" ] && source $HOME/.zshenv -plugins=(osx brew git github redis-cli ruby rbenv gem bundler sublime pass docker zsh-syntax-highlighting) +if [[ ! -d ~/.zplug ]]; then + git clone https://github.com/zplug/zplug ~/.zplug + source ~/.zplug/init.zsh && zplug update --self +fi +source ~/.zplug/init.zsh -source $ZSH/oh-my-zsh.sh +zplug "zplug/zplug", hook-build:'zplug --self-manage' -export LANG=en_US.UTF-8 -export LANGUAGE=en_US.UTF-8 -export LC_ALL=en_US.UTF-8 -export PATH="/usr/local/bin:$PATH" +zplug "junegunn/fzf-bin", from:gh-r, as:command, rename-to:fzf +zplug "b4b4r07/enhancd", use:init.sh +if zplug check "b4b4r07/enhancd"; then + export ENHANCD_FILTER="fzf --height 50% --reverse --ansi" + export ENHANCD_DOT_SHOW_FULLPATH=1 +fi + +zplug "lib/completion", from:oh-my-zsh +zplug "lib/directories", from:oh-my-zsh +zplug "lib/grep", from:oh-my-zsh +zplug "lib/history", from:oh-my-zsh +zplug "lib/termsupport", from:oh-my-zsh + +zplug "plugins/asdf", from:oh-my-zsh +zplug "plugins/bundler", from:oh-my-zsh +zplug "plugins/docker", from:oh-my-zsh +zplug "plugins/git", from:oh-my-zsh + +zplug "zsh-users/zsh-completions" +zplug "zsh-users/zsh-syntax-highlighting", defer:2 + +if [[ $OSTYPE == *darwin* ]]; then + zplug "plugins/osx", from:oh-my-zsh + zplug "plugins/pass", from:oh-my-zsh +fi + +zplug "~/.zsh/themes", from:local, use:cheetah.zsh-theme, as:theme +[ -s "$HOME/.zsh.local" ] && source $HOME/.zsh.local + +zplug check || zplug install +zplug load