[zsh] Fix loading environment

Author: codebeige

profile

@@ -1,9 +1,9 @@
 export PATH=/usr/local/bin:/usr/local/sbin:$PATH
-export EDITOR='/usr/local/bin/vim'
-export PSQL_EDITOR='vim -c"set syntax=pgsql"'
+export EDITOR='nvim'
+export PSQL_EDITOR='nvim -c"set syntax=pgsql"'
 export NODE_PATH=/usr/local/lib/node_modules
 
 # bundle-exec
 [ -f ~/.bundler-exec.sh ] && source ~/.bundler-exec.sh
 export NODE_PATH=/usr/local/lib/jsctags/:$NODE_PATH
-export NODE_PATH=/usr/local/lib/jsctags/:$NODE_PAT
+export NODE_PATH=/usr/local/lib/jsctags/:$NODE_PATH

vimrc

@@ -62,6 +62,9 @@ set shiftround
 map ö [
 map ä ]
 
+noremap <c-ö> <esc>
+noremap! <c-ö> <esc>
+
 map ° ~
 
 nnoremap gü g]

zsh/config/editor.zsh

@@ -1,5 +1,4 @@
-export EDITOR='nvim -e'
-export VISUAL='nvim'
+export EDITOR='nvim'
 
 alias vim=nvim
 alias vi=nvim

zsh/config/plugins/nvm/nvm.plugin.zsh

@@ -1,7 +1,3 @@
-export NVM_DIR="$HOME/.nvm"
-[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
-[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
-
 autoload -U add-zsh-hook
 load-nvmrc() {
   local node_version="$(nvm version)"

zsh/env/nvm.zsh

@@ -1,2 +1,2 @@
-[[ -z "$NVM_DIR" ]] && export NVM_DIR="$HOME/.nvm"
-[[ -f "$NVM_DIR/nvm.sh" ]] && source "$NVM_DIR/nvm.sh"
+[[ -z $NVM_DIR ]] && export NVM_DIR=$HOME/.nvm
+[[ -f $NVM_DIR/nvm.sh ]] && source $NVM_DIR/nvm.sh

zsh/env/rbenv.zsh

@@ -1,3 +1,2 @@
 export RBENV_ROOT=~/.rbenv
 path=($RBENV_ROOT/shims "$path[@]")
-

zshenv

@@ -1,3 +1,3 @@
 typeset -U path
 path=(~/bin /usr/local/bin "$path[@]")
-source ~/.zsh/env/*.zsh
+for file in ~/.zsh/env/*.zsh; do source $file; done

zshrc

@@ -65,3 +65,7 @@ source $ZSH/oh-my-zsh.sh
 export LANG='de_DE.UTF-8'
 export LC_ALL='de_DE.UTF-8'
 export TERM='xterm-256color'
+
+export NVM_DIR="$HOME/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
+[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion