X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/771eb3ba0503e3a2c34767b4ae8a42da9591a5ae..5f7a37092d2d250c176c4779106fc88c0e3e38a4:/vim/vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 1dce66c..10e5770 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -27,7 +27,6 @@ Plugin 'kshenoy/vim-signature'
 Plugin 'majutsushi/tagbar'
 Plugin 'raimondi/delimitmate'
 " Plugin 'rking/ag.vim'
-Plugin 'scrooloose/nerdtree'
 Plugin 'scrooloose/syntastic'
 Plugin 'shougo/vimproc.vim'
 Plugin 'shougo/unite.vim'
@@ -101,10 +100,10 @@ set nostartofline       " don't move the cursor to the first non-blank char of a
 set path=.,include/,../include/,/usr/include/c++/*,/opt/ros/hydro/include
 
 " displaying text {{{2
-set scrolloff=5                 " number of screen lines to show around the cursor
 set nowrap                      " long lines wrap
 set linebreak                   " wrap long lines at a character in 'breakat'
 set showbreak=↪                 " show these chars for wrapped lines
+set breakindent                 " preserve indentation in wrapped text
 
 set lazyredraw                  " don't redraw while executing macros
 
@@ -112,12 +111,14 @@ set list                        " show chars defined in 'listchars'
 set listchars=tab:❭\            " list of strings used for list mode
 set listchars+=extends:❯,precedes:❮
 " Only shown when not in insert mode
+au InsertLeave * :set listchars+=trail:·
 augroup trailing
     au!
     au InsertEnter * :set listchars-=trail:·
     au InsertLeave * :set listchars+=trail:·
 augroup END
 
+set scrolloff=5                 " number of screen lines to show around the cursor
 set sidescroll=1                " number of collumns to scroll
 set sidescrolloff=1             " don't scroll over the listchars
 
@@ -470,15 +471,6 @@ nmap <silent> cog <Plug>IndentGuidesToggle
 nmap <silent> [og <Plug>IndentGuidesEnable
 nmap <silent> ]og <Plug>IndentGuidesDisable
 
-" NERDTree {{{2
-" open/close NERDTree with \e
-nmap <Leader>e :NERDTreeToggle<CR>
-nmap <F6> :NERDTreeToggle<CR>
-" <space> to open files/dirs
-let NERDTreeMapActivateNode='l'
-" close vim if only NERDTree is open
-autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTreeType == "primary") | q | endif
-
 " python-mode {{{2
 
 let g:pymode_rope_completion = 0