From 5743154a14a7a1805af83d68337b90b3727001f1 Mon Sep 17 00:00:00 2001 From: "Adam A.G. Shamblin" Date: Fri, 19 Jan 2018 12:02:33 -0700 Subject: [PATCH] Replace command-t with ctrlp, add ale for linting --- .gitmodules | 9 ++++++--- dotbash_profile | 30 ++++++++++++------------------ dotvim/bundle/ale | 1 + dotvim/bundle/command-t | 1 - dotvim/bundle/ctrlp.vim | 1 + dotvim/bundle/tslint.vim | 2 +- dotvimrc | 19 ++++++++++--------- 7 files changed, 31 insertions(+), 32 deletions(-) create mode 160000 dotvim/bundle/ale delete mode 160000 dotvim/bundle/command-t create mode 160000 dotvim/bundle/ctrlp.vim diff --git a/.gitmodules b/.gitmodules index fceefd4..dbca2d7 100644 --- 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 7106bdf..0d37176 100644 --- 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 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 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 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 c36628d..cf915b0 120000 --- 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 a59cf69..36b2ef1 100644 --- 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 :tabnew map :tabnext @@ -50,7 +50,10 @@ let NERDTreeRespectWildIgnore=1 let NERDTreeShowHidden=1 let NERDTreeIgnore=['\.pyc$', '__pycache__'] -map f :CommandT +let g:ale_set_loclist=0 +let g:ale_set_quickfix=1 + +map f :CtrlP map a :NERDTreeToggle map b :Gblame map d :Gdiff @@ -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 -- 2.39.5