|
|
@@ -19,8 +19,6 @@ autocmd! User YouCompleteMe call youcompleteme#Enable()
|
|
|
|
|
|
|
|
|
" ***** simple plugins
|
|
|
-" can launch an interactive program within an Vim buffer (like bash or other shells)
|
|
|
-Plug 'oplatek/Conque-Shell', { 'on': ['ConqueTerm', 'ConqueTermSplit', 'ConqueTermVSplit']}
|
|
|
" easy buffer management. Replaced by Unite
|
|
|
"Plugin 'jlanzarotta/bufexplorer'
|
|
|
" supposedly make '%' more powerful
|
|
|
@@ -217,6 +215,7 @@ let g:ycm_collect_identifiers_from_tags_files=0
|
|
|
let g:ycm_collect_identifiers_from_comments_and_strings = 0
|
|
|
let g:ycm_complete_in_comments = 1
|
|
|
let g:ycm_key_invoke_completion = '<C-N>'
|
|
|
+" let g:ycm_path_to_python_interpreter = '/opt/local/bin'
|
|
|
"let g:ycm_extra_conf_globlist = ['~/.ycm_extra_conf.py']
|
|
|
let g:ycm_global_ycm_extra_conf = '~/.ycm_extra_conf.py'
|
|
|
let g:ycm_use_ultisnips_completer = 1
|
|
|
@@ -265,9 +264,10 @@ augroup json_autocmd
|
|
|
autocmd FileType json set textwidth=78 shiftwidth=2
|
|
|
autocmd FileType json set softtabstop=2 tabstop=8
|
|
|
autocmd FileType json set expandtab
|
|
|
- autocmd FileType json set foldmethod=syntax
|
|
|
+ autocmd FileType json set foldmethod=indent
|
|
|
augroup END
|
|
|
|
|
|
+autocmd filetype crontab setlocal nobackup nowritebackup
|
|
|
|
|
|
" #####DirDiff#####
|
|
|
let g:DirDiffExcludes = ".*.*.swp,*.d"
|
|
|
@@ -385,45 +385,15 @@ set number
|
|
|
set norelativenumber
|
|
|
|
|
|
set expandtab
|
|
|
-set shiftwidth=4
|
|
|
-set softtabstop=4
|
|
|
+set shiftwidth=2
|
|
|
+set softtabstop=2
|
|
|
set autoindent
|
|
|
set nosmartindent
|
|
|
+set foldmethod=indent
|
|
|
|
|
|
-" Solarized settings
|
|
|
-"let g:solarized_termcolors=256
|
|
|
-"set background=light
|
|
|
-"set background=dark
|
|
|
-"colorscheme solarized
|
|
|
-
|
|
|
-" seoul256 settings
|
|
|
-" let g:seoul256_background = 236
|
|
|
-" colorscheme seoul256
|
|
|
-" let g:airline_theme="tomorrow"
|
|
|
-
|
|
|
-" Gruvbox settings
|
|
|
-let g:gruvbox_italic=0
|
|
|
set background=dark
|
|
|
-" set background=light
|
|
|
-colorscheme gruvbox
|
|
|
-
|
|
|
-" Paper-color settings
|
|
|
-" colorscheme PaperColor-Dark
|
|
|
-" let g:airline_theme="hybrid"
|
|
|
-
|
|
|
-" colorscheme bubblegum
|
|
|
-" set background=dark
|
|
|
-
|
|
|
-" colorscheme wombat256
|
|
|
-" colorscheme zenburn
|
|
|
-" colorscheme kolor
|
|
|
-" colorscheme jellybeans
|
|
|
-" colorscheme hybrid
|
|
|
-" colorscheme devbox-dark-256
|
|
|
-" colorscheme Tomorrow-Night-Eighties
|
|
|
-" colorscheme Tomorrow-Night
|
|
|
|
|
|
-"colorscheme carvedwoodcool
|
|
|
+colorscheme devbox-dark-256
|
|
|
|
|
|
syntax on
|
|
|
|
|
|
@@ -511,7 +481,7 @@ nnoremap cp :pclose<CR>
|
|
|
|
|
|
"{{{ ***** COMMANDS ***** "
|
|
|
" make todo list
|
|
|
-command! -nargs=* -complete=file Todos Unite -keep-focus -auto-resize -no-quit -buffer-name=Todos vimgrep:*:TODO(wreed)
|
|
|
+command! -nargs=* -complete=file Todos Unite -keep-focus -auto-resize -no-quit -buffer-name=Todos vimgrep:*:TODO(sjaffe)
|
|
|
|
|
|
"Wrapper for make sequence
|
|
|
"replaced by vim-dispatch plugin
|
