From 9ca9f18c936eae3168a35ce33b3855d8082aef3b Mon Sep 17 00:00:00 2001 From: Jannik ZANDER Date: Fri, 10 Aug 2018 16:43:35 +0200 Subject: [PATCH] Recover previm --- .gitmodules | 3 --- pack/markdown/start/previm | 1 - vimrc | 35 ++++++++++++++++------------------- 3 files changed, 16 insertions(+), 23 deletions(-) delete mode 160000 pack/markdown/start/previm diff --git a/.gitmodules b/.gitmodules index aef8e26..34a6da0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -88,9 +88,6 @@ [submodule "pack/async/start/gen_tags.vim"] path = pack/async/opt/gen_tags.vim url = https://github.com/jsfaint/gen_tags.vim.git -[submodule "pack/markdown/opt/previm"] - path = pack/markdown/start/previm - url = https://github.com/previm/previm.git [submodule "pack/markdown/start/open-browser.vim"] path = pack/markdown/start/open-browser.vim url = https://github.com/tyru/open-browser.vim.git diff --git a/pack/markdown/start/previm b/pack/markdown/start/previm deleted file mode 160000 index 6ab010b..0000000 --- a/pack/markdown/start/previm +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6ab010bd5a76afcd3772559bc78e76edcd0107d0 diff --git a/vimrc b/vimrc index 7628444..32e441e 100644 --- a/vimrc +++ b/vimrc @@ -1,4 +1,4 @@ -;" Use :help 'option' to see the documentation for the given option. +" Use :help 'option' to see the documentation for the given option. set nocompatible filetype plugin indent on syntax on @@ -103,18 +103,16 @@ set fileformats=unix,dos,mac set fileignorecase " colors -set t_Co=256 set background=dark +set t_Co=256 set cursorline set cursorcolumn +highlight Cursorline cterm=NONE ctermbg=darkgrey +highlight Cursorcolumn ctermbg=darkgrey highlight linenr ctermfg=grey +highlight! link folded normal highlight BadWhitespace ctermfg=red match BadWhitespace /\s\+$/ -"highlight Cursorline cterm=NONE ctermbg=darkgrey -"highlight Cursorcolumn ctermbg=darkgrey -highlight Cursorline ctermfg=NONE ctermbg=darkgrey -highlight Cursorcolumn ctermbg=darkgrey -highligh! link folded normal " fonts and chars set list @@ -174,8 +172,7 @@ cnoreabbrev w!! w !sudo tee "%" " Functions -" grep -" file:line:coloumn:message +" grep file:line:coloumn:message set grepformat^=%f:%l:%c:%m set grepprg=ag\ --vimgrep\ --skip-vcs-ignores\ --path-to-ignore\ ~/.ignore\ --cpp\ --cc command! -nargs=1 Ngrep lvimgrep "" $HOME/cloud/Notes/**/*.md @@ -206,7 +203,15 @@ endfunction " Autocommands if has('autocmd') - augroup tabstospaces + augroup filetypes + autocmd! + autocmd BufNewFile,BufRead *.{md,mdwn,mkd,mkdn,mark*} set filetype=markdown + autocmd BufNewfile,BufRead *.gradle set filetype=groovy + autocmd BufNewfile,BufRead *.json set filetype=json + autocmd BufNewfile,BufRead *.yml set filetype=yaml + augroup end + + augroup formats autocmd! autocmd FileType c setlocal expandtab softtabstop=2 shiftwidth=2 autocmd FileType cpp setlocal expandtab softtabstop=2 shiftwidth=2 @@ -217,14 +222,6 @@ if has('autocmd') autocmd FileType netrw setlocal bufhidden=wipe augroup end - augroup filetypes - autocmd! - autocmd BufNewFile,BufRead *.{md,mdwn,mkd,mkdn,mark*} set filetype=markdown - autocmd BufNewfile,BufRead *.gradle set filetype=groovy - autocmd BufNewfile,BufRead *.json set filetype=json - autocmd BufNewfile,BufRead *.yml set filetype=yaml - augroup end - augroup saveall autocmd! autocmd FocusLost * silent! wa @@ -242,6 +239,7 @@ if has('autocmd') augroup end augroup quickfix + autocmd! " autocmd QuickFixCmdPost [^l]* nested cwindow " autocmd QuickFixCmdPost l* nested lwindow autocmd QuickFixCmdPost * call asyncrun#quickfix_toggle(8, 1) @@ -335,7 +333,6 @@ nnoremap pb :call PickBuffer() nnoremap pt :call PickTag() let g:pick_height = 10 - " deoplete set pyx=3 set pyxversion=3 -- 2.43.0