From: Jannik ZANDER Date: Tue, 24 Jul 2018 06:41:21 +0000 (+0200) Subject: Remove ranger.vim X-Git-Url: https://git.zndr.dk/?a=commitdiff_plain;h=238dce4c4077be57c6e8ce7d7cd1bd830218ceba;p=dotfiles.git Remove ranger.vim --- diff --git a/.gitmodules b/.gitmodules index 7f7cba8..372e317 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,9 +22,6 @@ [submodule ".vim/pack/plugins/opt/incsearch.vim"] path = .vim/pack/github/opt/incsearch.vim url = https://github.com/haya14busa/incsearch.vim.git -[submodule ".vim/pack/github/opt/bclose.vim"] - path = .vim/pack/github/opt/bclose.vim - url = https://github.com/rbgrouleff/bclose.vim.git [submodule ".vim/pack/github/opt/vim-pandoc-syntax"] path = .vim/pack/github/opt/vim-pandoc-syntax url = https://github.com/vim-pandoc/vim-pandoc-syntax.git @@ -40,9 +37,6 @@ [submodule ".vim/pack/github/opt/mesonic"] path = .vim/pack/github/opt/mesonic url = https://github.com/igankevich/mesonic.git -[submodule ".vim/pack/github/opt/ranger.vim"] - path = .vim/pack/github/opt/ranger.vim - url = https://github.com/francoiscabrol/ranger.vim.git [submodule ".vim/pack/github/opt/vim-snippets"] path = .vim/pack/github/opt/vim-snippets url = https://github.com/honza/vim-snippets.git diff --git a/.vim/pack/github/opt/bclose.vim b/.vim/pack/github/opt/bclose.vim deleted file mode 160000 index dd55ebc..0000000 --- a/.vim/pack/github/opt/bclose.vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit dd55ebc4097d40b0335f3be15656d31b8fa250ef diff --git a/.vim/pack/github/opt/ranger.vim b/.vim/pack/github/opt/ranger.vim deleted file mode 160000 index 118afa2..0000000 --- a/.vim/pack/github/opt/ranger.vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 118afa234620bea927235e4bdbe2064fd7e15775 diff --git a/.vim/vimrc b/.vim/vimrc index f9fc55d..7cf83bd 100644 --- a/.vim/vimrc +++ b/.vim/vimrc @@ -125,25 +125,19 @@ let &t_SI.="\e[5 q" let &t_EI.="\e[1 q" let &t_te.="\e[0 q" -"General Mappings +"Basic Mappings let mapleader = "," let maplocalleader = " " - set pastetoggle=p -nnoremap * :grep \| copen -nnoremap t :TagbarToggle -command! -nargs=1 Ngrep lvimgrep "" $HOME/cloud/Notes/**/*.md -command! -range=% Rst :'<,'>!pandoc -f markdown -t rst - -noremap -noremap -noremap -noremap -noremap :bn -noremap :bp -noremap! -noremap! +noremap +noremap +noremap +noremap +noremap :bn +noremap :bp +noremap! +noremap! "noremap z :bp "noremap q :bp "noremap x :bn @@ -161,15 +155,18 @@ nnoremap n nzzzv nnoremap N Nzzzv nnoremap + :exe "resize " . (winheight(0) * 3/2) nnoremap - :exe "resize " . (winheight(0) * 2/3) -nnoremap :noh +nnoremap :noh nnoremap ev :edit $MYVIMRC -nnoremap m :wa:Make nnoremap sh :term - +nnoremap m :wa:Make +nnoremap * :grep \| copen +nnoremap t :TagbarToggle "nnoremap html :-1read ~/.vim/template/html3jwf>a "nnoremap php :-1read ~/.vim/template/php2ja "" Visual Mode Mappings +vnoremap jk +vnoremap vmap < >gv @@ -205,6 +202,7 @@ let g:netrw_sort_sequence = '[\/]$,*' " 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 function! s:CmakeInit() let &errorformat="%f(%l) : %t%*\\D%n: %m,%*[^\"]\"%f\"%*\\D%l: %m,%f(%l) : %m,%*[^ ] %f %l: %m,%f:%l:%c:%m,%f(%l):%m,%f|%l| %m" @@ -227,45 +225,45 @@ command! -bang -nargs=0 -complete=file Iar call s:Iar() " Autocommands if has('autocmd') augroup expandtabs - au! - au FileType c setlocal expandtab softtabstop=2 shiftwidth=2 - au FileType cpp setlocal expandtab softtabstop=2 shiftwidth=2 - au FileType make setlocal noexpandtab tabstop=8 shiftwidth=8 - au FileType python setlocal expandtab softtabstop=4 shiftwidth=4 + autocmd! + autocmd FileType c setlocal expandtab softtabstop=2 shiftwidth=2 + autocmd FileType cpp setlocal expandtab softtabstop=2 shiftwidth=2 + autocmd FileType make setlocal noexpandtab tabstop=8 shiftwidth=8 + autocmd FileType python setlocal expandtab softtabstop=4 shiftwidth=4 \ formatoptions+=croq colorcolumn=79 \ cinwords=if,elif,else,for,while,try,except,finally,def,class,with augroup end augroup filetypes - au! - au bufnewfile,bufread *.md,*.txt set filetype=pandoc - au bufnewfile,bufread *.gradle set filetype=groovy - au bufnewfile,bufread *.json set filetype=json - au bufnewfile,bufread *.yml set filetype=yaml + autocmd! + autocmd bufnewfile,bufread *.md,*.txt set filetype=pandoc + 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! - au focuslost * wall + autocmd! + autocmd focuslost * wall augroup end augroup numbers - au! - au bufenter,focusgained,insertleave * set relativenumber - au bufleave,focuslost,insertenter * set norelativenumber + autocmd! + autocmd bufenter,focusgained,insertleave * set relativenumber + autocmd bufleave,focuslost,insertenter * set norelativenumber augroup end augroup vimrc - au! - au bufwritepost ~/.vim/gvimrc silent source % - au bufwritepost ~/.vim/vimrc silent source % - au bufwritepost ~/.vim/vimrc.local silent source % + autocmd! + autocmd bufwritepost ~/.vim/gvimrc silent source % + autocmd bufwritepost ~/.vim/vimrc silent source % + autocmd bufwritepost ~/.vim/vimrc.local silent source % augroup end augroup quickfix -" autocmd QuickFixCmdPost [^l]* nested cwindow -" autocmd QuickFixCmdPost l* nested lwindow - au QuickFixCmdPost * call asyncrun#quickfix_toggle(8, 1) +" autocmd QuickFixCmdPost [^l]* nested cwindow +" autocmd QuickFixCmdPost l* nested lwindow + autocmd QuickFixCmdPost * call asyncrun#quickfix_toggle(8, 1) augroup end endif @@ -301,11 +299,6 @@ let GtagsCscope_Quiet = 1 " Unimpaired packadd! vim-unimpaired -" Ranger -packadd! ranger.vim -packadd! bclose.vim -let g:ranger_replace_netrw = 1 - " Matchit packadd! matchit