diff --git a/.bash_aliases b/.bash_aliases index 4d7c0be..d70fc73 100644 --- a/.bash_aliases +++ b/.bash_aliases @@ -87,6 +87,6 @@ alias srsly="orly -s" alias whothefuckis='finger' alias whoami="echo 24601" -function gvim () { - `which gvim` $* &> /dev/null -} +#function gvim () { + #`which gvim` $* &> /dev/null +#} diff --git a/.gitmodules b/.gitmodules index 922bd85..d69c9b1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -94,3 +94,6 @@ [submodule ".vim/bundle/vim-surround"] path = .vim/bundle/vim-surround url = https://github.com/tpope/vim-surround +[submodule ".vim/bundle/julia-vim"] + path = .vim/bundle/julia-vim + url = https://github.com/JuliaLang/julia-vim diff --git a/.vim/bundle/YouCompleteMe b/.vim/bundle/YouCompleteMe index b1bba2e..47a0048 160000 --- a/.vim/bundle/YouCompleteMe +++ b/.vim/bundle/YouCompleteMe @@ -1 +1 @@ -Subproject commit b1bba2e2012efa81444bedafa12ddbdae2cccd93 +Subproject commit 47a0048f346ba686e6c6b12eacec100b33e8feaa diff --git a/.vim/bundle/calendar-vim b/.vim/bundle/calendar-vim index 523c5b5..b340c43 160000 --- a/.vim/bundle/calendar-vim +++ b/.vim/bundle/calendar-vim @@ -1 +1 @@ -Subproject commit 523c5b532cc8ca509fc86c33ca1ca6b61ee18978 +Subproject commit b340c438355e70ba3a648ccfc0e2be9b94662808 diff --git a/.vim/bundle/julia-vim b/.vim/bundle/julia-vim new file mode 160000 index 0000000..b7a244b --- /dev/null +++ b/.vim/bundle/julia-vim @@ -0,0 +1 @@ +Subproject commit b7a244b7b15b96d212c5cd300b54de4b87fa7b11 diff --git a/.vim/bundle/syntastic b/.vim/bundle/syntastic index f23ddae..47f0541 160000 --- a/.vim/bundle/syntastic +++ b/.vim/bundle/syntastic @@ -1 +1 @@ -Subproject commit f23ddae1a7982b40dbfbe55033c1817480f0a0ed +Subproject commit 47f054112b91431f4af391e133f2fcc5f639309c diff --git a/.vim/bundle/vim-airline b/.vim/bundle/vim-airline index 5f1c245..b7c88b4 160000 --- a/.vim/bundle/vim-airline +++ b/.vim/bundle/vim-airline @@ -1 +1 @@ -Subproject commit 5f1c24528c143c80e40016995fc902fb8b74eeee +Subproject commit b7c88b40aa40936245c2bfc3f8c1dbdc9393ddc0 diff --git a/.vim/bundle/vim-gitgutter b/.vim/bundle/vim-gitgutter index ae81dcc..13a11f8 160000 --- a/.vim/bundle/vim-gitgutter +++ b/.vim/bundle/vim-gitgutter @@ -1 +1 @@ -Subproject commit ae81dccb679a423f871809d83c6829442760748a +Subproject commit 13a11f89354ca63b88a64b3bf452f2b9d6dbc716 diff --git a/.vim/bundle/vim-unimpaired b/.vim/bundle/vim-unimpaired index 9a8be36..2ad0376 160000 --- a/.vim/bundle/vim-unimpaired +++ b/.vim/bundle/vim-unimpaired @@ -1 +1 @@ -Subproject commit 9a8be3696bc50064b9d9d146041ec4264e36e341 +Subproject commit 2ad03764b67093179932f8c7105b7fddee02dcdb diff --git a/.vimrc b/.vimrc index f7a9090..a632831 100644 --- a/.vimrc +++ b/.vimrc @@ -177,7 +177,7 @@ let g:ConqueTerm_SendVisKey = 'ss' " * YouCompleteMe let g:ycm_global_ycm_extra_conf = '~/.ycm_extra_conf.py' let g:ycm_confirm_extra_conf = 0 -let g:ycm_key_invoke_completion = "" +let g:ycm_key_invoke_completion = "" "let g:ycm_add_preview_to_completeopt = 1 "let g:ycm_autoclose_preview_window_after_completion = 1