mutt: fix F macro to not write message to home

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 8d0d5adcd6ffd49f8bd711a1760185c1f2d03e5d..c8829a325f8e97f4a125c721c1590e1a906511ed 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -7,6 +7,9 @@
 set runtimepath ^=$XDG_CONFIG_HOME/vim
 set runtimepath +=$XDG_CONFIG_HOME/vim/after
 
+" force python3
+if has('python3') | endif
+
 " plugins {{{1
 " remove all autocommands
 autocmd!
@@ -17,6 +20,7 @@ Plug 'junegunn/vim-plug'
 
 Plug 'airblade/vim-gitgutter'
 Plug 'alepez/vim-gtest'
+Plug 'alx741/vinfo'
 Plug 'andrewradev/switch.vim'
 Plug 'bling/vim-airline'
 Plug 'chrisbra/checkattach'
@@ -30,12 +34,11 @@ Plug 'kshenoy/vim-signature'
 Plug 'majutsushi/tagbar'
 Plug 'octol/vim-cpp-enhanced-highlight'
 Plug 'raimondi/delimitmate'
-Plug 'ram-z/vim-clang-format', { 'branch': 'fix-undo' }
-Plug 'ram-z/vimwiki', { 'branch': 'dev' }
-Plug 'scrooloose/syntastic'
+Plug 'vimwiki/vimwiki', { 'branch': 'dev' }
+" Plug 'scrooloose/syntastic'
 Plug 'sgeb/vim-diff-fold'
 Plug 'shougo/unite.vim'
-Plug 'shougo/vimproc.vim'
+Plug 'shougo/vimproc.vim', {'do': 'make'}
 Plug 'sjl/gundo.vim'
 Plug 'thinca/vim-qfreplace'
 Plug 'tomtom/tcomment_vim'
@@ -44,13 +47,16 @@ Plug 'tpope/vim-endwise'
 Plug 'tpope/vim-eunuch'
 Plug 'tpope/vim-fugitive'
 Plug 'tpope/vim-repeat'
+Plug 'tpope/vim-scriptease'
+Plug 'tpope/vim-speeddating'
 Plug 'tpope/vim-surround'  "investigate vim-sandwich
 Plug 'tpope/vim-unimpaired'
 Plug 'tweekmonster/spellrotate.vim'
-Plug 'valloric/youcompleteme', { 'do': './install.py --clang-completer' }
+Plug 'valloric/youcompleteme', { 'do': './install.py --clangd-completer --clang-completer' }
 Plug 'vim-scripts/mediawiki.vim'
 Plug 'vim-scripts/replacewithregister'
 Plug 'vim-scripts/yankring.vim'
+Plug 'wincent/loupe'
 
 " colorschemes
 Plug 'morhetz/gruvbox'
@@ -66,13 +72,21 @@ Plug 'sgur/vim-textobj-parameter'
 Plug 'kana/vim-operator-user'
 
 " staging
-" find an alternative (latex-box? Automatic Latex Plugin?)
-Plug 'vim-latex/vim-latex'
-Plug 'alx741/vinfo'
-" needs editing colorscheme
-" Plug 'jeaye/color_coded'
 " Check LucHermites plugins: https://github.com/LucHermitte/lh-cpp
-Plug 'wincent/loupe'
+Plug 'dense-analysis/ale' " {{{2
+let g:ale_echo_msg_format = '[%linter%] %code: %%s'
+let g:ale_c_parse_compile_commands = 1
+let g:ale_cpp_parse_compile_commands = 1
+" don't use loclist as it's being populated by ycm
+" (might want to enable for other filetypes)
+let g:ale_set_loclist = 0
+let g:ale_cpp_gcc_options = ''
+let g:ale_linters_ignore = { 'cpp': ['clangd', 'clangtidy', 'clang'] }
+
+Plug 'git@github.com:/ram-z/vim-orgmode', { 'branch': 'dev' } " {{{2
+Plug 'vim-scripts/syntaxrange'
+
+let g:org_agenda_files = ['~/org/*.org']
 
 call plug#end()
 
@@ -340,8 +354,21 @@ augroup END
 map <space> <leader>
 
 " make
-nnoremap <leader>r :make!<cr>
-nnoremap <leader><cr> :make!<cr>
+function! Make()
+  let l:make_dir = ""
+  if exists("b:make_dir")
+    let l:make_dir = "-C ".b:make_dir
+  elseif exists("g:make_dir")
+    let l:make_dir = "-C ".g:make_dir
+  endif
+
+  let l:make_targets = ""
+  if exists("g:make_targets")
+    let l:make_targets = g:make_targets
+  endif
+  execute "make! ".l:make_dir." ".l:make_targets
+endf
+nnoremap <leader>r :call Make()<cr>
 
 " unhighlight search
 nnoremap <silent> <Leader>/ :silent nohl<CR>
@@ -419,8 +446,8 @@ cnoremap <C-A> <Home>
 cnoremap <C-E> <End>
 
 " proper movement when lines are wrapped
-noremap <expr> j (v:count == 0 ? 'gj' : 'j')
-noremap <expr> k (v:count == 0 ? 'gk' : 'k')
+noremap <silent><expr> j (v:count == 0 ? 'gj' : 'j')
+noremap <silent><expr> k (v:count == 0 ? 'gk' : 'k')
 
 " disable arrows
 noremap  <Up>    <NOP>
@@ -597,6 +624,8 @@ let g:syntastic_style_warning_symbol='S'
 let g:syntastic_always_populate_loc_list=1
 nmap <silent> <leader>y :SyntasticCheck<cr>
 
+let g:syntastic_cpp_clang_tidy_post_args = "-p build*"
+
 if ! &diff
   let g:syntastic_check_on_open=1
 endif
@@ -683,6 +712,9 @@ call unite#custom#source('file_rec/async', 'sorters', 'sorter_selecta')
 call unite#custom#default_action('buffer', 'open')
 nnoremap <silent> [unite]b :<C-u>Unite buffer:-<CR>
 
+" unite-jumplist {{{3
+nnoremap <silent> [unite]j :<C-u>Unite output:jumps:<CR>
+
 " unite-menu {{{3
 let g:unite_source_menu_menus = {}
 let g:unite_source_menu_menus.fugitive = { 'description' : 'fugitive menu'}
@@ -709,8 +741,7 @@ function! YRRunAfterMaps()
 endfunction
 
 " youcompleteme {{{2
-let g:ycm_extra_conf_globlist = ['~/src/*','/mnt/data/src/*']
-let g:ycm_global_ycm_extra_conf = expand('$XDG_CONFIG_HOME/vim/ycm_extra_conf.py')
+let g:ycm_clangd_binary_path = 'clangd'   " use clangd in path
 let g:ycm_extra_conf_vim_data = ['getcwd()']
 let g:ycm_add_preview_to_completeopt = 1
 let g:ycm_complete_in_comments = 1
@@ -732,11 +763,6 @@ nnoremap <Leader>tu :GTestRunUnderCursor<CR>
 " vim-json {{{2
 let g:vim_json_syntax_conceal = 0
 
-" vim-latex {{{2
-let g:tex_flavor='latex'
-let g:Tex_DefaultTargetFormat='pdf'
-let g:Tex_MultipleCompileFormats='pdf'
-
 " vim-sneak {{{2
 let g:sneak#streak = 1
 let g:sneak#target_labels = "aoeuisnthdpylrcgfqjkxzmwvz" " dvorak
@@ -783,7 +809,7 @@ nnoremap <silent> gs :<C-U>set operatorfunc=SortLinesOpFunc<CR>g@
 vnoremap <silent> gs :sort<cr>
 
 " edit configs  {{{2
-function! EditConfig(what)
+function! EditConfig(what, ext = '.vim')
     let l:dir = split(&runtimepath,',')[0]
     if a:what == 'vimrc'
         let l:file = expand($MYVIMRC)
@@ -792,7 +818,7 @@ function! EditConfig(what)
     elseif empty(&filetype)
         echoe 'filetype is empty!'
     else
-        let l:file = l:dir.'/'.a:what.'/'.&filetype.'.vim'
+        let l:file = l:dir.'/'.a:what.'/'.&filetype.a:ext
     endif
 
     execute ':vsplit '.file
@@ -802,7 +828,7 @@ nmap <leader>ev :call EditConfig('vimrc')<CR>
 nmap <leader>ef :call EditConfig('ftplugin')<CR>
 nmap <leader>es :call EditConfig('syntax')<CR>
 nmap <leader>ei :call EditConfig('indent')<CR>
-nmap <leader>eu :UltiSnipsEdit<CR>:lcd %:p:h<CR>
+nmap <leader>eu :call EditConfig('ultisnips', '.snippets')<CR>
 
 " spell check {{{2
 " http://tex.stackexchange.com/a/52932