Replace command-t with ctrlp, add ale for linting

diff --git a/.gitmodules b/.gitmodules
index fceefd45385e8acff508b19e088435cbf58d97e2..dbca2d7fc6997048e3340a57752344e1cf97fbbb 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,6 @@
 [submodule "dotvim/bundle/vim-fugitive"]
        path = dotvim/bundle/vim-fugitive
        url = http://github.com/tpope/vim-fugitive.git
-[submodule "dotvim/bundle/command-t"]
-       path = dotvim/bundle/command-t
-       url = https://github.com/wincent/command-t.git
 [submodule "dotvim/bundle/nerdtree"]
        path = dotvim/bundle/nerdtree
        url = https://github.com/scrooloose/nerdtree.git
@@ -25,3 +22,9 @@
 [submodule "dotvim/bundle/vim-solidity"]
        path = dotvim/bundle/vim-solidity
        url = git@github.com:tomlion/vim-solidity.git
+[submodule "dotvim/bundle/ale"]
+       path = dotvim/bundle/ale
+       url = git@github.com:w0rp/ale.git
+[submodule "dotvim/bundle/ctrlp.vim"]
+       path = dotvim/bundle/ctrlp.vim
+       url = git@github.com:ctrlpvim/ctrlp.vim.git

diff --git a/dotbash_profile b/dotbash_profile
index 7106bdf29d76499ed7458c83415dba51f6f47601..0d37176f7244494aaa11282d48b1d688471eea8b 100644 (file)
--- a/dotbash_profile
+++ b/dotbash_profile
@@ -1,6 +1,5 @@
 export CLICOLOR=1
 export GREP_COLOR="1;36"
-export PYTHONPATH="/usr/local/lib/python2.7/site-packages:$PYTHONPATH"
 export PYTHON_ENV_PATH=$HOME/env
 export PIP_REQUIRE_VIRTUALENV=true
 export POSTGRES_PATH=/Applications/Postgres.app/Contents/Versions/latest/bin
@@ -112,6 +111,18 @@ export PATH=$PATH:$PLAY_PATH
 export GOPATH=$HOME/Projects/go
 export PATH=$PATH:$(go env GOPATH)/bin
 
+##################################################
+#
+#   Node Stuffs
+#
+##################################################
+
+export NVM_DIR="$HOME/.nvm"
+
+if [ -f /usr/local/opt/nvm/nvm.sh ]; then
+    . /usr/local/opt/nvm/nvm.sh
+fi
+
 ##################################################
 #
 #   SSH hosts autocomplete
@@ -137,25 +148,8 @@ complete -F _ssh_hosts ssh
 #
 ##################################################
 
-if ![[ hash pbcopy 2>/dev/null ]]; then
-    alias pbcopy='xsel --clipboard --input'
-    alias pbpaste='xsel --clipboard --output'
-fi
-
 alias jsoncb="pbpaste | python -mjson.tool | gvim -"
 alias grep="grep --color=auto"
 
-# Setting PATH for Python 3.5
-# The orginal version is saved in .bash_profile.pysave
-PATH="/Library/Frameworks/Python.framework/Versions/3.5/bin:${PATH}"
-export PATH
-
-[[ -s "$HOME/.profile" ]] && source "$HOME/.profile"
-
-# Setting PATH for Python 3.6
-# The original version is saved in .bash_profile.pysave
-PATH="/Library/Frameworks/Python.framework/Versions/3.6/bin:${PATH}"
-export PATH
-
 export PATH="$HOME/.cargo/bin:$PATH"
 export PATH="~/.npm-global/bin:$PATH"

diff --git a/dotvim/bundle/ale b/dotvim/bundle/ale
new file mode 160000 (submodule)
index 0000000..3115d20
--- /dev/null
+++ b/dotvim/bundle/ale
@@ -0,0 +1 @@
+Subproject commit 3115d2025a3a9ae1492a8d85e01497a8ddd8c60a

diff --git a/dotvim/bundle/command-t b/dotvim/bundle/command-t
deleted file mode 160000 (submodule)
index d2467c8..0000000
--- a/dotvim/bundle/command-t
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d2467c84af8a1f1a2d0366127550d0a241dd2548

diff --git a/dotvim/bundle/ctrlp.vim b/dotvim/bundle/ctrlp.vim
new file mode 160000 (submodule)
index 0000000..88abbcb
--- /dev/null
+++ b/dotvim/bundle/ctrlp.vim
@@ -0,0 +1 @@
+Subproject commit 88abbcb926a415b789ff648cbdc86ed4b353bfc1

diff --git a/dotvim/bundle/tslint.vim b/dotvim/bundle/tslint.vim
index c36628d74a7df84bb652338bdb20c881b873e1ed..cf915b02f432eadecb9c90b4f5d098b6f7379d9b 120000 (symlink)
--- a/dotvim/bundle/tslint.vim
+++ b/dotvim/bundle/tslint.vim
@@ -1 +1 @@
-/home/adam/Projects/tslint.vim
\ No newline at end of file
+/Users/adam.shamblin/Projects/tslint.vim
\ No newline at end of file

diff --git a/dotvimrc b/dotvimrc
index a59cf695d04db65da37d9fa3a18b3462c17c2389..36b2ef12ceff9d61cee7e273d8177f9e991864ac 100644 (file)
--- a/dotvimrc
+++ b/dotvimrc
@@ -24,9 +24,9 @@ set backupdir=~/.saves
 set noswapfile
 set expandtab
 set smartindent
-set softtabstop=4
-set tabstop=4
-set shiftwidth=4
+set softtabstop=2
+set tabstop=2
+set shiftwidth=2
 set noerrorbells
 set visualbell
 set vb
@@ -36,7 +36,7 @@ set switchbuf=usetab
 set mouse=a
 set ttymouse=xterm2
 set guioptions-=T
-set guifont=Menlo:h13
+set guifont=Menlo:h12
 
 map <C-t> :tabnew<cr>
 map <C-tab> :tabnext<cr>
@@ -50,7 +50,10 @@ let NERDTreeRespectWildIgnore=1
 let NERDTreeShowHidden=1
 let NERDTreeIgnore=['\.pyc$', '__pycache__']
 
-map <leader>f :CommandT<cr>
+let g:ale_set_loclist=0
+let g:ale_set_quickfix=1
+
+map <leader>f :CtrlP<cr>
 map <leader>a :NERDTreeToggle<cr>
 map <leader>b :Gblame<cr>
 map <leader>d :Gdiff<cr>
@@ -87,6 +90,7 @@ function! s:Repl()
 endfunction
 
 autocmd FileType make setlocal noexpandtab
+autocmd Filetype python setlocal tabstop=4 softtabstop=4 shiftwidth=4
 
 au BufNewFile,BufRead *.js set filetype=javascript
 au BufNewFile,BufRead *.json set filetype=javascript
@@ -95,10 +99,7 @@ au BufNewFile,BufRead Podfile,*.podspec set filetype=ruby
 au BufNewFile,BufRead /usr/local/nginx/conf/* set filetype=nginx
 au BufNewFile,BufRead *.less set filetype=less
 au BufNewFile,BufRead *.md,*.txt setlocal textwidth=80
-au BufWritePost *.py call Flake8()
-au BufWritePost *.js :JSHint
-au BufWritePost *.ts :TSLint
-au BufWritePost *.go :GoLint
+"au BufWritePost *.py call Flake8()
 
 au BufNewFile,BufRead *.dat setlocal noexpandtab
 au BufNewFile,BufRead *.jade setlocal noexpandtab