zshrc cleanup

2 files changed, 20 insertions, 22 deletions

diff --git a/.zsh_plugins.txt b/.zsh_plugins.txt
index f9a515d..6f01eed 100644
--- a/.zsh_plugins.txt
+++ b/.zsh_plugins.txt
@@ -1,7 +1,6 @@
 rupa/z
 andrewferrier/fzf-z
-zdharma/fast-syntax-highlighting
 zsh-users/zsh-autosuggestions
-zsh-users/zsh-history-substring-search
 zsh-users/zsh-completions
 lukechilds/zsh-nvm
+zdharma/fast-syntax-highlighting
diff --git a/.zshrc b/.zshrc
index 65151d4..65dfbc4 100644
--- a/.zshrc
+++ b/.zshrc
@@ -15,38 +15,37 @@ HISTFILE=$HOME/.zsh_history
 HISTSIZE=100000
 SAVEHIST=$HISTSIZE
 
-setopt hist_ignore_all_dups # remove older duplicate entries from history
-setopt hist_reduce_blanks # remove superfluous blanks from history items
-setopt inc_append_history # save history entries as soon as they are entered
-setopt share_history # share history between different instances of the shell
-setopt auto_cd # cd by typing directory name if it's not a command
-setopt auto_list # automatically list choices on ambiguous completion
-setopt auto_menu # automatically use menu completion
-setopt always_to_end # move cursor to end if word had one match
-
+EDITOR=vim
+bindkey -e # force emacs mode
+
+setopt hist_ignore_all_dups   # remove older duplicate entries from history
+setopt hist_reduce_blanks     # remove superfluous blanks from history items
+setopt inc_append_history     # save history entries as soon as they are entered
+setopt share_history          # share history between different instances of the shell
+setopt auto_cd                # cd by typing directory name if it's not a command
+setopt auto_list              # automatically list choices on ambiguous completion
+setopt auto_menu              # automatically use menu completion
+setopt always_to_end          # move cursor to end if word had one match
+
+# nvm
 export NVM_LAZY_LOAD=true
-export NVM_LAZY_LOAD_EXTRA_COMMANDS=('vim')
 
+# fzf
 export FZF_DEFAULT_COMMAND='rg --files'
 export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"
 export FZF_CTRL_T_OPTS="--preview 'bat --color=always --style=numbers --line-range=:500 {}'"
+[ -f /usr/share/fzf/key-bindings.zsh ] && source /usr/share/fzf/key-bindings.zsh
+[ -f /usr/share/fzf/completion.zsh ] && source /usr/share/fzf/completion.zsh
 
 export GPG_TTY=$(tty)
 
 export TERM=xterm-256color
 
-source ~/.zsh_plugins.sh
-[ -f /usr/share/fzf/key-bindings.zsh ] && source /usr/share/fzf/key-bindings.zsh
-[ -f /usr/share/fzf/completion.zsh ] && source /usr/share/fzf/completion.zsh
-
-alias config='/usr/bin/git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME'
-
-eval $(keychain --eval --quiet id_rsa)
 
-case $(uname -a) in
-   *Microsoft*) unsetopt BG_NICE ;;
-esac
+alias config='/usr/bin/git --git-dir=$HOME/.cfg/ --work-tree=$HOME'
 
 eval "$(starship init zsh)"
 
 [ -f $HOME/.zshrc.local ] && source $HOME/.zshrc.local
+
+source ~/.zsh_plugins.sh