10 files changed, 57 insertions, 27 deletions
diff --git a/gvimrc.dot.link b/gvimrc.dot.link
index c8044b2..00733fc 100644
--- a/gvimrc.dot.link
+++ b/gvimrc.dot.link
@@ -1,36 +1,46 @@
-" GVIM Configuration
+" GVIM Configuration {{{
+
+" Basic {{{
 set background=light
 set mouse=a
 set guioptions-=m " remove menu bar
 set guioptions-=T " remove toolbar
+" }}}
 
-" GVIM IDE Configuration
+" GVIM IDE Configuration {{{
 set nocompatible " must be the first line
 filetype on
 filetype indent on
 filetype plugin on
 set laststatus=2
 set statusline=%<%f\%h%m%r%=%-20.(line=%l\ \ col=%c%V\ \ totlin=%L%)\ \ \%h%m%r%=%-40(bytval=0x%B,%n%Y%)\%P
+" }}}
 
-" Change to the current file's folder
+" Change to the current file's folder {{{
 map <leader>cd :cd %:p:h>cr<
+" }}}
 
-" Font configuration
+" Font configuration {{{
+"
 " Terminus is currently rendering slowly
 "set gfn=Terminus\ 8
 "set gfn=PowerlineFont\ 8
 set gfn=Monospace\ 8
+" }}}
 
-" 256 colors support
+" 256 colors support {{{
 set t_Co=256
+" }}}
 
-" Color scheme
+" Color scheme {{{
 "colorscheme solarized
 colorscheme xoria256
+" }}}
 
-" Powerline
+" Powerline {{{
 "set showtabline=1 " Do not display the tabline if there's just one tab
 "let g:Powerline_symbols='fancy'
 "python from powerline.vim import setup as powerline_setup
 "python powerline_setup()
 "python del powerline_setup
+" }}}
diff --git a/vim.dot.link/filetype.vim b/vim.dot.link/filetype.vim
index e75d2e0..79e09ab 100644
--- a/vim.dot.link/filetype.vim
+++ b/vim.dot.link/filetype.vim
@@ -1,4 +1,4 @@
-" Vim support file to detect file types
+" Vim support file to detect file types {{{
 
 " Check if file type config is already loaded {{{
 if exists("did_load_filetypes")
diff --git a/vim.dot.link/plugin/auto_file.vim b/vim.dot.link/plugin/auto_file.vim
index 72e782f..2d46efc 100644
--- a/vim.dot.link/plugin/auto_file.vim
+++ b/vim.dot.link/plugin/auto_file.vim
@@ -1,4 +1,4 @@
-" auto_file.vim - Automatically file reading, saving; directory changer.
+" auto_file.vim - Automatically file reading, saving; directory change {{{
 
 " Autoread {{{
 "
diff --git a/vim.dot.link/plugin/key_mappings.vim b/vim.dot.link/plugin/key_mappings.vim
index 0c8bfba..ceb1a51 100644
--- a/vim.dot.link/plugin/key_mappings.vim
+++ b/vim.dot.link/plugin/key_mappings.vim
@@ -1,4 +1,4 @@
-" key_mappings.vim - Custom Key Mappings
+" key_mappings.vim - Custom Key Mappings {{{
 "
 " Author: Silvio Rhatto <rhatto@riseup.net>
 "
@@ -249,3 +249,4 @@ map <leader>e :put =strftime('## %Y-%m-%d')<CR>
 " Remove trailing whitespaces {{{
 noremap <leader>w :call TrimWhitespace()<CR>
 " }}}
+"
diff --git a/vim.dot.link/plugin/lib.vim b/vim.dot.link/plugin/lib.vim
index 9e7b689..f1b2a30 100644
--- a/vim.dot.link/plugin/lib.vim
+++ b/vim.dot.link/plugin/lib.vim
@@ -1,9 +1,9 @@
-" lib.vim - Miscelaneous functions
+" lib.vim - Miscelaneous functions {{{
 "
 " Author: Silvio Rhatto <rhatto@riseup.net>
 "
 
-" Checkbox handling
+" Checkbox handling {{{
 "
 " This is commented out because vitalk/vim-simple-todo is being used instead.
 "
@@ -19,8 +19,9 @@
 "    call setline('.', substitute(line, '- ', '- \[ \] ', ''))
 "  endif
 "endf
+" }}}
 
-" Remove trailing spaces
+" Remove trailing spaces {{{
 "
 " Thanks https://vi.stackexchange.com/a/456
 fun! TrimWhitespace()
@@ -30,3 +31,4 @@ fun! TrimWhitespace()
 endfun
 
 command! TrimWhitespace call TrimWhitespace()
+" }}}
diff --git a/vim.dot.link/plugin/nerdtree_customizations.vim b/vim.dot.link/plugin/nerdtree_customizations.vim
index f2e42ec..95b50f3 100644
--- a/vim.dot.link/plugin/nerdtree_customizations.vim
+++ b/vim.dot.link/plugin/nerdtree_customizations.vim
@@ -1,12 +1,15 @@
-" nedtree_customizations.vim - NERDTree customizations
+" nedtree_customizations.vim - NERDTree customizations {{{
 "
 " Initially adapted from
 " http://stackoverflow.com/questions/1447334/how-do-you-add-nerdtree-to-your-vimrc
 "
 " Author: Silvio Rhatto <rhatto@riseup.net>
 
+" Use the minimal UI {{{
 let NERDTreeMinimalUI=1
+" }}}
 
+" NERDTree autogroup {{{
 augroup nerdtree
   autocmd!
 
@@ -17,22 +20,29 @@ augroup nerdtree
   autocmd FileType nerdtree set relativenumber
   autocmd FileType taglist  set relativenumber
 augroup END
+" }}}
 
+" TabNew {{{
 function TabNew(address)
   execute ":tabnew"
   execute ":NERDTree " a:address
 endfunction
+" }}}
 
+" TabNewBookmark {{{
 function TabNewBookmark(bookmark)
   execute ":tabnew"
   execute ":NERDTreeFromBookmark " a:bookmark
 endfunction
+" }}}
 
+" OpenNERDTree {{{
 function OpenNERDTree()
   execute ":NERDTree"
 endfunction
+" }}}
 
-" Shortcuts
+" Shortcuts {{{
 cnoreabbrev t NERDTree
 cnoreabbrev b NERDTreeFromBookmark
 cnoreabbrev s OpenSession
@@ -41,3 +51,4 @@ cnoreabbrev ssave SaveSession
 command -nargs=1 -complete=dir T :call TabNew(<f-args>)
 command -nargs=1 -complete=customlist,nerdtree#completeBookmarks B :call TabNewBookmark(<f-args>)
 command -nargs=0 OpenNERDTree :call OpenNERDTree()
+" }}}
diff --git a/vim.dot.link/plugin/session_workarounds.vim b/vim.dot.link/plugin/session_workarounds.vim
index 31dec9f..75d59cb 100644
--- a/vim.dot.link/plugin/session_workarounds.vim
+++ b/vim.dot.link/plugin/session_workarounds.vim
@@ -1,4 +1,4 @@
-" session_workarounds.vim - Session restoration workarounds
+" session_workarounds.vim - Session restoration workarounds {{{
 "
 " Author: Silvio Rhatto <rhatto@riseup.net>
 "
diff --git a/vim.dot.link/plugin/ui.vim b/vim.dot.link/plugin/ui.vim
index 631d493..2dbdd78 100644
--- a/vim.dot.link/plugin/ui.vim
+++ b/vim.dot.link/plugin/ui.vim
@@ -1,27 +1,29 @@
-" ui.vim - UI customization
+" ui.vim - UI customization {{{
 "
 " Author: Silvio Rhatto <rhatto@riseup.net>
 
-" Status and tab lines
+" Status and tab lines {{{
 set laststatus=2  " Always display the statusline in all windows
 set showtabline=2 " Always display the tabline, even if there is only one tab
 set noshowmode    " Hide the default mode text (e.g. -- INSERT -- below the statusline)
+" }}}
 
-" Powerline
+" Powerline {{{
 "python from powerline.vim import setup as powerline_setup
 "python powerline_setup()
 "python del powerline_setup
-"
+" }}}
 
-" Airline
+" Airline {{{
 if $WINDOWID != ""
   let g:airline_powerline_fonts=1
   let g:airline#extensions#tabline#enabled=1
 else
   let g:loaded_airline = 1
 endif
+" }}}
 
-" Color scheme
+" Color scheme {{{
 "colorscheme github
 "colorscheme solarized
 "colorscheme gentooish
@@ -36,3 +38,4 @@ if $WINDOWID != ""
 else
   colorscheme zenburn
 endif
+" }}}
diff --git a/vim.dot.link/plugin/window_title.vim b/vim.dot.link/plugin/window_title.vim
index b602af1..af0ce01 100644
--- a/vim.dot.link/plugin/window_title.vim
+++ b/vim.dot.link/plugin/window_title.vim
@@ -1,20 +1,22 @@
-" window_title.vim - Window title handling
+" window_title.vim - Window title handling {{{
 "
 " Author: Silvio Rhatto <rhatto@riseup.net>
 
-" Basic settings
+" Basic settings {{{
 set title
 set titleold="terminal"
 set titlestring=vim:\ %F
+" }}}
 
-" Handling titles when vim is embedded in specific programs
+" Handling titles when vim is embedded in specific programs {{{
 augroup vimleave
   autocmd!
   au VimLeave *mutt/*   silent call ResetTitle("mutt")
   au VimLeave *remind/* silent call ResetTitle("calendar")
 augroup END
+" }}}
 
-" Reset window titles
+" Reset window titles {{{
 "
 " Thanks to http://stackoverflow.com/questions/1673649/vimrc-action-onclose
 function! ResetTitle(title)
@@ -25,3 +27,4 @@ function! ResetTitle(title)
   "exec ":!echo -e '\033kbash\033\\'\<CR>"
   exec ":!xtitle -q " a:title
 endfunction
+" }}}
diff --git a/vimrc.dot.link b/vimrc.dot.link
index 8989a1f..bb47f89 100644
--- a/vimrc.dot.link
+++ b/vimrc.dot.link
@@ -1,4 +1,4 @@
-" VIM configuration
+" VIM configuration {{{
 
 " Basic options {{{
 syn on