From: Jannik ZANDER <jannikz@gmail.com>
Date: Sun, 8 Jul 2018 21:41:52 +0000 (+0200)
Subject: Fix vim-ranger
X-Git-Url: https://git.zndr.dk/?a=commitdiff_plain;h=34d75cb16167ef2036c5b56274909cd58e6b449b;p=dotfiles.git

Fix vim-ranger
---

diff --git a/.gitmodules b/.gitmodules
index d0245c7..851871d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -37,3 +37,9 @@
 [submodule ".vim/pack/github/opt/vim-ranger"]
 	path = .vim/pack/github/opt/vim-ranger
 	url = https://github.com/Mizuchi/vim-ranger.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/bclose.vim"]
+	path = .vim/pack/github/opt/bclose.vim
+	url = https://github.com/rbgrouleff/bclose.vim.git
diff --git a/.vim/pack/github/opt/bclose.vim b/.vim/pack/github/opt/bclose.vim
new file mode 160000
index 0000000..dd55ebc
--- /dev/null
+++ b/.vim/pack/github/opt/bclose.vim
@@ -0,0 +1 @@
+Subproject commit dd55ebc4097d40b0335f3be15656d31b8fa250ef
diff --git a/.vim/pack/github/opt/ranger.vim b/.vim/pack/github/opt/ranger.vim
new file mode 160000
index 0000000..118afa2
--- /dev/null
+++ b/.vim/pack/github/opt/ranger.vim
@@ -0,0 +1 @@
+Subproject commit 118afa234620bea927235e4bdbe2064fd7e15775
diff --git a/.vim/pack/github/ranger b/.vim/pack/github/ranger
deleted file mode 160000
index 392f3a4..0000000
--- a/.vim/pack/github/ranger
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 392f3a45530eb49dd35340999165c4c743050fab
diff --git a/.vim/vimrc b/.vim/vimrc
index 0f11350..8fe7d6c 100644
--- a/.vim/vimrc
+++ b/.vim/vimrc
@@ -1,53 +1,20 @@
 syntax on
 filetype plugin indent on
 
-" Colors and Fonts
-highlight Normal guibg=black guifg=white
-set background=dark
-set t_Co=256
-if (&t_Co > 2 || has("gui_running"))
-  if exists("&guifont")
-    if has("mac")
-      set guifont=monaco:h11
-    elseif has("unix")
-      set guifont=inconsolata\ 11
-    elseif has("win32")
-"      set guifont=consolas:h11,courier\ new:h10
-      set guifont=consolas:h10:cANSI:qDRAFT
-    endif
-  endif
-endif
-
-" block cursor in normal mode
-let &t_ti.="\e[1 q"
-let &t_SI.="\e[5 q"
-let &t_EI.="\e[1 q"
-let &t_te.="\e[0 q"
-
 " General options
-silent !mkdir -p ~/.local/share/vim/{swap,backup,undo}
-set directory=~/.local/share/vim/swap
-set backupdir=~/.local/share/vim/backup
-set undodir=~/.local/share/vim/undo
-set viminfo+=n~/.local/share/vim/viminfo
 set path=.,,**,C:\programs\IAR\\\ System\EWB_V850_V360\common\bin
 set fileformats=unix,dos,mac
 set printoptions=paper:letter
 set shell=/bin/bash
-set undofile
-set autoread
-set autowrite
 set backspace=2
 set breakindent showbreak=\ +
 set clipboard=unnamed
-"set foldmethod=syntax
-"set foldlevel=1
-"set foldclose=all
-"set foldopen+=jump
+
 set guioptions+=a
 "set guioptions-=m "menu bar
 set guioptions-=T "toolbar
 set guioptions-=r "scroolbar
+
 set complete-=i     " searching includes can be slow
 set history=200
 set incsearch       " incremental search
@@ -59,9 +26,6 @@ set number
 set scrolloff=1
 set shiftround
 set shortmess=aoOtI
-set laststatus=2
-set cmdheight=2
-set showcmd
 set showmatch
 set sidescrolloff=5
 set smartcase
@@ -71,12 +35,33 @@ set ttimeoutlen=50  " make esc work faster
 set visualbell
 set virtualedit=block
 set updatetime=250
-set wildmenu
-set wildmode=longest:full,full
-set wildignore+=tags,.*.un~,*.pyc
 set winaltkeys=no
+set wildignore+=tags,.*.un~,*.pyc
 
-" Programs
+" folding
+set foldmethod=syntax
+set foldlevel=1
+set foldclose=all
+set foldopen+=jump
+
+" buffers
+silent !mkdir -p ~/.vim/undo
+set viminfo+=n~/./vim/viminfo
+set undodir=~/.vim/undo
+set undofile
+set nohidden
+set nobackup
+set noswapfile
+set autoread
+set autowrite
+set autowriteall
+
+" command and status line 
+set showcmd
+set cmdheight=2
+set laststatus=2
+set wildmenu
+set wildmode=longest:full,full
 
 " make
 "set makeprg=cmake\ --build\ .
@@ -113,6 +98,8 @@ cnoreabbrev w!!      w !sudo tee "%"
 " Commands
 
 " Plugins
+" ALE
+packadd ale
 
 " Tagbar
 packadd tagbar
@@ -132,9 +119,9 @@ let g:netrw_banner = 0
 let g:netrw_sort_sequence = '[\/]$,*'
 
 " Ranger
-packadd vim-ranger
-let g:ranger_on_exit = 'bw!'
-let g:ranger_open_mode = 'edit'
+packadd ranger.vim
+packadd bclose.vim
+let g:ranger_replace_netrw = 1
 
 " Airline
 packadd vim-airline
@@ -159,10 +146,38 @@ let g:ctrlp_user_command = ['.git/', 'git --git-dir=%s/.git ls-files -oc --exclu
 nnoremap <Leader>b   :CtrlPBuffer<CR>
 nnoremap <Leader>m   :CtrlPMRU<CR>
 
+
+" Colors and Fonts
+highlight Normal guibg=black guifg=white
+set background=dark
+set t_Co=256
+if (&t_Co > 2 || has("gui_running"))
+  if exists("&guifont")
+    if has("mac")
+      set guifont=monaco:h11
+    elseif has("unix")
+      set guifont=inconsolata\ 11
+    elseif has("win32")
+"      set guifont=consolas:h11,courier\ new:h10
+      set guifont=consolas:h10:cANSI:qDRAFT
+    endif
+  endif
+endif
+
+" block cursor in normal mode
+let &t_ti.="\e[1 q"
+let &t_SI.="\e[5 q"
+let &t_EI.="\e[1 q"
+let &t_te.="\e[0 q"
+
 " autocommands
 autocmd BufReadPost quickfix nnoremap <buffer> <CR> <CR>
 autocmd bufnewfile,bufread *.md set filetype=markdown
 autocmd bufnewfile,bufread *.gradle set filetype=groovy
+augroup save
+  au!
+  au FocusLost * wall
+augroup END
 
 " local
 if filereadable(expand('~/.vim/vimrc.local'))