Browse Source

Merge branch 'master' into box

main
Noah Hall 4 years ago
parent
commit
37eaa7903d
3 changed files with 19 additions and 5 deletions
  1. +5
    -0
      .gitconfig
  2. +11
    -5
      .vimrc
  3. +3
    -0
      setup.sh

+ 5
- 0
.gitconfig View File

@ -24,6 +24,11 @@
[push]
default = simple
[merge "ours"]
driver = true
[filter "lfs"]
clean = git-lfs clean %f
smudge = git-lfs smudge %f
required = true
driver = true
[credential]
helper = store

+ 11
- 5
.vimrc View File

@ -44,6 +44,7 @@ source ~/.regexlist.vim
set ruler
set wildmenu
au Filetype html setlocal tabstop=2 shiftwidth=2
" au BufRead,BufNewFile *.less set filetype=css "only if no less highlighting :P
au BufRead,BufNewFile *.swig set filetype=htmldjango
@ -54,15 +55,20 @@ au Filetype scss setlocal tabstop=2 shiftwidth=2
au Filetype javascript setlocal tabstop=2 shiftwidth=2
" pylint chokes a bit on django :(
let g:syntastic_python_pylint_args = "--load-plugins django_pylint"
" let g:syntastic_python_pylint_args = "--load-plugins django_pylint"
let g:ale_python_pylint_options = '--load-plugins pylint_django'
" always populate error list for :lnext, :lprev
let g:syntastic_always_populate_loc_list = 1
" let g:syntastic_always_populate_loc_list = 1
" correctly highlight JSX in .js files
let g:jsx_ext_required = 0
" use eslint, not jshint
let g:syntastic_javascript_checkers = ['eslint']
" let g:syntastic_javascript_checkers = ['eslint']
let g:ale_linters = {
\ 'javascript': ['eslint'],
\}
" Tell vim to remember certain things when we exit
" '20 : marks will be remembered for up to 20 previously edited files
@ -86,8 +92,8 @@ augroup resCur
autocmd BufWinEnter * call ResCur()
augroup END
" better vimdiff highlighting
colorscheme mycolorscheme
set background=light
colorscheme solarized
" deploy shortcut
command DW w | AsyncRun deploy water


+ 3
- 0
setup.sh View File

@ -22,6 +22,9 @@ clones=(
airblade/vim-gitgutter
pangloss/vim-javascript
mxw/vim-jsx
altercation/vim-colors-solarized.git
skywind3000/asyncrun
w0rp/ale
)
mkdir -p /home/${DEST}/.vim/bundle
cd /home/${DEST}/.vim/bundle


Loading…
Cancel
Save