diff --git a/.gitmodules b/.gitmodules index 66474cc..ef7edf6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -25,3 +25,6 @@ [submodule "bundle/vim-elixir"] path = vim/.vim/bundle/vim-elixir url = https://github.com/elixir-lang/vim-elixir.git +[submodule "vim/.vim/bundle/alchemist"] + path = vim/.vim/bundle/alchemist + url = https://github.com/slashmili/alchemist.vim diff --git a/bash/.bashrc b/bash/.bashrc index 22df7df..f3ca3b7 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -9,3 +9,4 @@ fi export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting + diff --git a/bash/.profile b/bash/.profile index fd13138..c722b31 100644 --- a/bash/.profile +++ b/bash/.profile @@ -58,3 +58,6 @@ export TERM=xterm-256color export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64 +source $HOME/.asdf/asdf.sh +source $HOME/.asdf/completions/asdf.bash + diff --git a/vim/.vim/bundle/alchemist b/vim/.vim/bundle/alchemist new file mode 160000 index 0000000..6ccfc51 --- /dev/null +++ b/vim/.vim/bundle/alchemist @@ -0,0 +1 @@ +Subproject commit 6ccfc513d42465247341225e1a3fd06993345cca diff --git a/vim/.vim/vimrc b/vim/.vim/vimrc index 8b793ce..0f00e13 100644 --- a/vim/.vim/vimrc +++ b/vim/.vim/vimrc @@ -41,8 +41,8 @@ let java_allow_cpp_keywords=1 set ruler set number -set relativenumber set backspace=indent,eol,start +set incsearch set hlsearch set splitright @@ -65,15 +65,7 @@ let NERDTreeIgnore = ['\.pyc$'] set t_Co=256 colorscheme 256-grayvim -"colorscheme gentooish - -"let mapleader = "'" -"set pastetoggle=p -"map w :set wrap -"map e :set nowrap - -let g:vimwiki_list = [ {'path': '~/vimwiki'}, {'path': '~/Code/vimwiki-client-notes'} ] - +" " fixes webpack file watchers set backupcopy=yes