diff --git a/.vim/startup/vundle_vimrc b/.vim/startup/vundle_vimrc index ec42e8b..4585618 100644 --- a/.vim/startup/vundle_vimrc +++ b/.vim/startup/vundle_vimrc @@ -72,6 +72,7 @@ Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': '.install -all'} Plug 'junegunn/fzf.vim' Plug 'Valloric/YouCompleteMe', { 'do': 'python3 install.py --all' } Plug 'nathangrigg/vim-beancount' +Plug 'hashivim/vim-terraform' " Git plugin not hosted on GitHub Plug 'git://git.wincent.com/command-t.git' diff --git a/.zshrc b/.zshrc index 800d580..f2a7263 100644 --- a/.zshrc +++ b/.zshrc @@ -19,14 +19,14 @@ zinit ice lucid wait='1' zinit light-mode lucid wait for \ is-snippet OMZ::lib/history.zsh \ MichaelAquilina/zsh-you-should-use \ - romkatv/zsh-prompt-benchmark \ - zdharma-continuum/history-search-multi-word + zdharma-continuum/history-search-multi-word \ +# atload"alias zi='zinit'" -zinit ice wait"2" as"command" from"gh-r" lucid \ - mv"zoxide*/zoxide -> zoxide" \ - atclone"./zoxide init zsh > init.zsh" \ - atpull"%atclone" src"init.zsh" nocompile'!' -zinit light ajeetdsouza/zoxide +# zinit ice wait"2" as"command" from"gh-r" lucid \ +# mv"zoxide*/zoxide -> zoxide" \ +# atclone"./zoxide init zsh > init.zsh" \ +# atpull"%atclone" src"init.zsh" nocompile'!' +# zinit light ajeetdsouza/zoxide # binary release, unpack provide fzf zinit ice from"gh-r" as"program" @@ -107,8 +107,8 @@ fi # zinit light denysdovhan/spaceship-prompt zinit ice depth=1; zinit light romkatv/powerlevel10k -zinit ice as"program" from"gh-r" mv"exa* -> exa" pick"exa/exa" lucid atload"alias ls='exa --icons'" -zinit light ogham/exa +# zinit ice as"program" from"gh-r" mv"exa* -> exa" pick"exa/exa" lucid atload"alias ls='exa --icons'" +# zinit light ogham/exa # OS specific plugins case `uname` in diff --git a/zsh/env.zsh b/zsh/env.zsh index 2f5a82a..3ed8162 100644 --- a/zsh/env.zsh +++ b/zsh/env.zsh @@ -29,7 +29,7 @@ export GOKU_EDN_CONFIG_FILE="$HOME/dotfiles/karabiner/karabiner.edn" export PATH="/usr/local/sbin:$PATH" export PATH="$HOME/.local/bin:$PATH" -eval "$(zoxide init zsh)" +# eval "$(zoxide init zsh)" if [[ -d $HOME/.pyenv ]]; then diff --git a/zsh/fzf.zsh b/zsh/fzf.zsh index 563557d..640fd89 100644 --- a/zsh/fzf.zsh +++ b/zsh/fzf.zsh @@ -108,11 +108,11 @@ fs() { tmux switch-client -t "$session" } -unalias z 2> /dev/null -z() { - [ $# -gt 0 ] && _z "$*" && return - cd "$(_z -l 2>&1 | fzf --height 40% --nth 2.. --reverse --inline-info +s --tac --query "${*##-* }" | sed 's/^[0-9,.]* *//')" -} +# unalias z 2> /dev/null +# z() { +# [ $# -gt 0 ] && _z "$*" && return +# cd "$(_z -l 2>&1 | fzf --height 40% --nth 2.. --reverse --inline-info +s --tac --query "${*##-* }" | sed 's/^[0-9,.]* *//')" +# } #alias lp="lpass show -c --password $(lpass ls | fzf | awk '{print $(NF)}' | sed 's/\]//g')"