From 179ccc8e96e1acbbdf6ec71fd87a606cbe84c501 Mon Sep 17 00:00:00 2001
From: ViViDboarder <ViViDboarder@gmail.com>
Date: Thu, 13 Aug 2015 22:43:20 -0700
Subject: [PATCH] Startupify and cleanup

---
 .gitignore                     |  2 ++
 vim/rc/init.rc.vim             |  1 +
 vim/rc/plugins.rc.vim          | 49 ++++++++++++++++++----------------
 vim/rc/plugins/ctrlp.rc.vim    |  4 +--
 vim/rc/plugins/startify.rc.vim |  7 +++++
 5 files changed, 38 insertions(+), 25 deletions(-)
 create mode 100644 vim/rc/plugins/startify.rc.vim

diff --git a/.gitignore b/.gitignore
index 6c0a226..0dcd0bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,5 +7,7 @@ vim/autoload/plug.vim.old
 vim/backup/*~
 vim/plugged/*
 vim/rc/*.local.rc.vim
+vim/rc/plugins/*.local.rc.vim
 vim/tmp/*.swo
 vim/tmp/*.swp
+vim/tmp/viminfo
diff --git a/vim/rc/init.rc.vim b/vim/rc/init.rc.vim
index 0f8dde0..d89d675 100644
--- a/vim/rc/init.rc.vim
+++ b/vim/rc/init.rc.vim
@@ -18,6 +18,7 @@ set mouse=a
 set backup
 set backupdir=~/.vim/backup
 set directory=~/.vim/tmp
+set viminfo='100,n~/.vim/tmp/viminfo
 
 " Filetype extension
 au BufRead,BufNewFile *.md set syntax=markdown
diff --git a/vim/rc/plugins.rc.vim b/vim/rc/plugins.rc.vim
index d6c514c..c3248ca 100644
--- a/vim/rc/plugins.rc.vim
+++ b/vim/rc/plugins.rc.vim
@@ -105,6 +105,8 @@ endif
 " }}
 
 " GUI {{
+Plug 'mhinz/vim-startify'
+call s:smart_source_rc('plugins/startify')
 Plug 'bling/vim-airline'
 " vim-airline {{
 " Use short-form mode text
@@ -169,20 +171,21 @@ Plug 'tmux-plugins/vim-tmux'
 Plug 'alfredodeza/coveragepy.vim'
 Plug 'alfredodeza/pytest.vim'
 Plug 'davidhalter/jedi-vim'
-" {{
-    let g:jedi#completions_enabled = 0
-    let g:jedi#auto_vim_configuration = 0
-" }}
+" jedi-vim {{
+let g:jedi#completions_enabled = 0
+let g:jedi#auto_vim_configuration = 0
+" }} jedi-vim
 Plug 'klen/python-mode'
-" {{
-    let g:pymode_breakpoint = 0
-    let g:pymode_lint = 0
-    let g:pymode_lint_checkers = ['flake8']
-    let g:pymode_lint_on_write = 0
-    let g:pymode_rope = 0
-    let g:pymode_rope_complete_on_dot = 0
-    let g:pymode_rope_completion = 0
-    "}}
+" python-mode {{
+let g:pymode_breakpoint = 0
+let g:pymode_lint = 0
+let g:pymode_lint_checkers = ['flake8']
+let g:pymode_lint_on_write = 0
+let g:pymode_rope = 0
+let g:pymode_rope_complete_on_dot = 0
+let g:pymode_rope_completion = 0
+" }} python-mode
+
 " }}
 
 " Themes {{
@@ -202,12 +205,11 @@ Plug 'wombat256.vim'
 " neomake / vim-dispatch {{
 if has('nvim')
     Plug 'benekastah/neomake'
-    " {{
-        nmap <leader>nm :Neomake<CR>
-        nnoremap <F5> :Neomake<CR>
-        let g:neomake_python_enabled_makers = ['flake8']
-
-    " }}
+    " neomake {{
+    nmap <leader>nm :Neomake<CR>
+    nnoremap <F5> :Neomake<CR>
+    let g:neomake_python_enabled_makers = ['flake8']
+    " }} neomake
 else
     Plug 'tpope/vim-dispatch'
     nnoremap <F5> :Make<CR>
@@ -220,8 +222,9 @@ Plug 'tpope/vim-endwise'
 " emacs bindinds in insert
 Plug 'tpope/vim-rsi'
 Plug 'milkypostman/vim-togglelist'
-" {{
-    nnoremap <silent> <F6> :call ToggleQuickfixList()<CR>
-    nnoremap <silent> <F7> :call ToggleLocationList()<CR>
-" }}
+" vim-togglelist {{
+nnoremap <silent> <F6> :call ToggleQuickfixList()<CR>
+nnoremap <silent> <F7> :call ToggleLocationList()<CR>
+" }} vim-togglelist
+
 " }}
diff --git a/vim/rc/plugins/ctrlp.rc.vim b/vim/rc/plugins/ctrlp.rc.vim
index b826ce6..6f24264 100644
--- a/vim/rc/plugins/ctrlp.rc.vim
+++ b/vim/rc/plugins/ctrlp.rc.vim
@@ -4,8 +4,8 @@
 let g:ctrlp_max_height = 10
 " Conditional Mappings
 let g:ctrlp_map = '<C-t>'
-" Allow ctrl p to open over the initial nerdtree window
-let g:ctrlp_dont_split = 'netrw'
+" Allow ctrl p to open over startify
+let g:ctrlp_reuse_window = 'startify'
 " Support tag jumping
 let g:ctrlp_extensions = ['tag', 'buffertag']
 " Support Apex language
diff --git a/vim/rc/plugins/startify.rc.vim b/vim/rc/plugins/startify.rc.vim
new file mode 100644
index 0000000..9b0a215
--- /dev/null
+++ b/vim/rc/plugins/startify.rc.vim
@@ -0,0 +1,7 @@
+" Override in local rc
+" let g:startify_bookmarks = [
+"     \ '~/.vim',
+"     \ '~/workspace/my-shoestrap'
+"     \ ]
+" let g:startify_custom_header =
+"       \ map(split(system('fortune | cowsay'), '\n'), '"   ". v:val') + ['','']