Browse Source

js syntax, and colorscheme stuff

main
Noah Hall 4 years ago
parent
commit
323fd5b943
2 changed files with 8 additions and 1 deletions
  1. +4
    -0
      .gitconfig
  2. +4
    -1
      .vimrc

+ 4
- 0
.gitconfig View File

@ -25,3 +25,7 @@
default = simple
[merge "ours"]
driver = true
[filter "lfs"]
clean = git-lfs clean %f
smudge = git-lfs smudge %f
required = true

+ 4
- 1
.vimrc View File

@ -42,6 +42,7 @@ source ~/.regexlist.vim
set ruler
set wildmenu
au Filetype html setlocal tabstop=2 shiftwidth=2
" django/mybox specific
au Filetype htmldjango setlocal tabstop=2 shiftwidth=2
au Filetype css setlocal tabstop=2 shiftwidth=2
@ -52,6 +53,8 @@ let g:syntastic_python_pylint_args = "--load-plugins django_pylint"
" always populate error list for :lnext, :lprev
let g:syntastic_always_populate_loc_list = 1
let g:syntastic_javascript_checkers = ['eslint']
" Tell vim to remember certain things when we exit
" '20 : marks will be remembered for up to 20 previously edited files
" "100 : will save up to 100 lines for each register
@ -75,4 +78,4 @@ augroup resCur
augroup END
" better vimdiff highlighting
colorscheme mycolorscheme
" colorscheme mycolorscheme

Loading…
Cancel
Save