aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Beltran <ben@nsovocal.com>2019-03-14 23:17:28 +0100
committerBen Beltran <ben@nsovocal.com>2019-03-14 23:17:28 +0100
commite7572a53051b96e0d428111831c7abc5d24cb468 (patch)
treea8b5576912e861e237dab7457d1796d10b3a140e
parent4894266f66d35763118a6d96b9dae6e0d7d84658 (diff)
parent8bd7cd0472f56234ea851bde7300b112affd2776 (diff)
Merge branch 'master' of gitlab.com:rbdr/dotfiles
-rw-r--r--.gitmodules3
-rw-r--r--vim/.netrwhist3
m---------vim/bundle/ale0
m---------vim/bundle/syntastic0
-rwxr-xr-xvimrc9
5 files changed, 6 insertions, 9 deletions
diff --git a/.gitmodules b/.gitmodules
index 6ed076b..af24917 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -59,3 +59,6 @@
[submodule "vim/bundle/vim-vue"]
path = vim/bundle/vim-vue
url = https://github.com/posva/vim-vue
+[submodule "vim/bundle/ale"]
+ path = vim/bundle/ale
+ url = https://github.com/w0rp/ale
diff --git a/vim/.netrwhist b/vim/.netrwhist
index 8975a54..2a9c560 100644
--- a/vim/.netrwhist
+++ b/vim/.netrwhist
@@ -1,4 +1,5 @@
let g:netrw_dirhistmax =10
-let g:netrw_dirhist_cnt =2
+let g:netrw_dirhist_cnt =3
let g:netrw_dirhist_1='/usr/local/lib/python2.7/site-packages'
let g:netrw_dirhist_2='/Users/benbeltran/Projects/rack-machine'
+let g:netrw_dirhist_3='/Users/rbeltrandelrio/.dotfiles/config/karabiner'
diff --git a/vim/bundle/ale b/vim/bundle/ale
new file mode 160000
+Subproject 80ef7ea2d0b22f0d8de7387a3d5bf6e9e5b72e9
diff --git a/vim/bundle/syntastic b/vim/bundle/syntastic
deleted file mode 160000
-Subproject 1089ee5212b833d73c96ca93773b9eca1a0f721
diff --git a/vimrc b/vimrc
index 1eefa87..d1f7c9f 100755
--- a/vimrc
+++ b/vimrc
@@ -79,6 +79,7 @@ set backspace=indent,eol,start
" load the plugin and indent settings for the detected filetype
filetype plugin indent on
filetype plugin on
+set omnifunc=syntaxcomplete#Complete
" Opens an edit command with the path of the currently edited file filled in
" Normal mode: <Leader>e
@@ -171,14 +172,6 @@ endfunction
nnoremap <C-n> :call NumberToggle()<cr>
-" Syntastic stuff
-let g:syntastic_javascript_checkers = ['eslint']
-let g:syntastic_always_populate_loc_list = 1
-let g:syntastic_check_on_open = 1
-let g:syntastic_check_on_wq = 1
-let g:syntastic_error_symbol = "X"
-let g:syntastic_warning_symbol = "!"
-
" Dank Mono Italics
highlight Keyword cterm=italic