awesome: auto restart pomodoro

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 21773f9d30c5573d1d5a39bdc8abd92281e363c8..402a980c53622bf26131bbc8c3f93e2e5135aac7 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -293,6 +293,23 @@ Plug 'mtth/scratch.vim'  " {{{2
   let g:scratch_autohide = 0
 "}}}
 
   let g:scratch_autohide = 0
 "}}}
 

+Plug 'vim-pandoc/vim-pandoc'  " {{{2
+Plug 'vim-pandoc/vim-pandoc-syntax'
+let g:pandoc#syntax#conceal#use = 1
+let g:pandoc#syntax#conceal#blacklist = [
+    \ 'titleblock',
+    \ 'codeblock_start',
+    \ 'codeblock_delim',
+    \ 'atx',
+    \ ]
+let g:pandoc#syntax#codeblocks#embeds#langs = [
+    \ 'plantuml',
+    \ ]
+let g:pandoc#keyboard#blacklist_submodule_mappings = [
+    \ 'para',
+    \ ]
+"}}}
+

 " Plug 'jenterkin/vim-autosource'  " TODO: delete? {{{2
 "   let g:autosource_hashdir = $XDG_CACHE_HOME . '/vim/vim-autosource'
 "   let g:autosource_conf_names = ['.vimrc', '.vimrc.lua']
 " Plug 'jenterkin/vim-autosource'  " TODO: delete? {{{2
 "   let g:autosource_hashdir = $XDG_CACHE_HOME . '/vim/vim-autosource'
 "   let g:autosource_conf_names = ['.vimrc', '.vimrc.lua']


@@ -434,7 +451,9 @@ set shiftround                  " round to 'shiftwidth' for "<<" and ">>"
 set expandtab                   " expand <Tab> to spaces in Insert mode
 set autoindent
 
 set expandtab                   " expand <Tab> to spaces in Insert mode
 set autoindent
 

-set pastetoggle=<F11>           " key sequence to toggle paste mode
+if !has('nvim')
+  set pastetoggle=<F11>           " key sequence to toggle paste mode
+endif

 
 " folding {{{2
 set foldmethod=marker           " folding type
 
 " folding {{{2
 set foldmethod=marker           " folding type


@@ -546,34 +565,37 @@ augroup ft_stdin
     au StdinReadPost * :set buftype=nofile
 augroup END
 
     au StdinReadPost * :set buftype=nofile
 augroup END
 

-" Jump to last known cursor position {{{2
-augroup last_loc
+if !has("nvim")
+  " autocmds that already exist in neovim
+  " Jump to last known cursor position {{{2
+  augroup last_loc
+      au!
+      " blacklist certain filetype
+      let blacklist = ['gitcommit']
+      autocmd BufReadPost *
+                  \ if index(blacklist, &ft) < 0 && line("'\"") > 1 && line("'\"") <= line("$") |
+                  \   exe "normal! g`\"" |
+                  \ endif
+  augroup END
+
+  " Check for file modifications automatically {{{2
+  " (current buffer only)
+  " Use :NoAutoChecktime to disable it (uses b:autochecktime)
+  fun! MyAutoCheckTime()
+    " only check timestamp for normal files
+    if &buftype != '' | return | endif
+    if ! exists('b:autochecktime') || b:autochecktime
+      checktime %
+      let b:autochecktime = 1
+    endif
+  endfun
+  augroup MyAutoChecktime

     au!
     au!

-    " blacklist certain filetype
-    let blacklist = ['gitcommit']
-    autocmd BufReadPost *
-                \ if index(blacklist, &ft) < 0 && line("'\"") > 1 && line("'\"") <= line("$") |
-                \   exe "normal! g`\"" |
-                \ endif
-augroup END
-
-" Check for file modifications automatically {{{2
-" (current buffer only)
-" Use :NoAutoChecktime to disable it (uses b:autochecktime)
-fun! MyAutoCheckTime()
-  " only check timestamp for normal files
-  if &buftype != '' | return | endif
-  if ! exists('b:autochecktime') || b:autochecktime
-    checktime %
-    let b:autochecktime = 1
-  endif
-endfun
-augroup MyAutoChecktime
-  au!
-  au FocusGained,BufEnter,CursorHold,InsertEnter * call MyAutoCheckTime()
-augroup END
-command! NoAutoChecktime let b:autochecktime=0
-command! ToggleAutoChecktime let b:autochecktime=!get(b:, 'autochecktime', 0) | echom "b:autochecktime:" b:autochecktime
+    au FocusGained,BufEnter,CursorHold,InsertEnter * call MyAutoCheckTime()
+  augroup END
+  command! NoAutoChecktime let b:autochecktime=0
+  command! ToggleAutoChecktime let b:autochecktime=!get(b:, 'autochecktime', 0) | echom "b:autochecktime:" b:autochecktime
+endif

 
 " bindings {{{1
 
 
 " bindings {{{1
 


@@ -629,6 +651,9 @@ nnoremap <silent> <leader>ww :Untrail<CR>
 " Source
 vnoremap <leader>S y:execute @@<cr>:echo 'Sourced selection.'<cr>
 nnoremap <leader>S ^vg_y:execute @@<cr>:echo 'Sourced line.'<cr>
 " Source
 vnoremap <leader>S y:execute @@<cr>:echo 'Sourced selection.'<cr>
 nnoremap <leader>S ^vg_y:execute @@<cr>:echo 'Sourced line.'<cr>

+" Technically this is similar to execute this file, which is usually mapped to
+" <leader>r and it would make sense to have that for lua files in nvim folder
+nnoremap <leader>SS :source %<cr>:echo 'Sourced file.'<cr>

 
 " jump to last cursor position
 noremap ' `
 
 " jump to last cursor position
 noremap ' `


@@ -801,11 +826,9 @@ command! GToggle GitToggle
 nnoremap <silent> <leader>gs :GitToggle<CR>
 
 nnoremap <silent> <leader>gd :Gdiffsplit<CR>
 nnoremap <silent> <leader>gs :GitToggle<CR>
 
 nnoremap <silent> <leader>gd :Gdiffsplit<CR>

-nnoremap <silent> <leader>gc :echohl WarningMsg \| echo "use \<leader>gcc instead" \| echohl None<CR> 

 nnoremap <silent> <leader>gcc :tab G commit -v<CR>
 nnoremap <silent> <leader>gca :tab G commit -v --amend<CR>
 nnoremap          <leader>gcf :tab G commit -v --fixup=
 nnoremap <silent> <leader>gcc :tab G commit -v<CR>
 nnoremap <silent> <leader>gca :tab G commit -v --amend<CR>
 nnoremap          <leader>gcf :tab G commit -v --fixup=

-nnoremap <silent> <leader>gp :echohl WarningMsg \| echo "use \<leader>gpp instead" \| echohl None<CR> 

 nnoremap <silent> <leader>gpp :Git push \| copen<CR>
 nnoremap <silent> <leader>gpf :Git push --force-with-lease \| copen<CR>
 nnoremap <silent> <leader>gll :Git pull<CR>
 nnoremap <silent> <leader>gpp :Git push \| copen<CR>
 nnoremap <silent> <leader>gpf :Git push --force-with-lease \| copen<CR>
 nnoremap <silent> <leader>gll :Git pull<CR>