From dcc3a6af72b84107a9b7a1143d0b7073ea0620b2 Mon Sep 17 00:00:00 2001
From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
Date: Sun, 19 Jun 2016 03:43:21 +0300
Subject: [PATCH] Replace airline with lightline

Add gitgutter keybinds, rename vim-jade to vim-pug
Remove vim-smooth-scroll since I never really used it
---
 neostrophic.vim | 61 ++++++++++++++++++++++++++++++++++---------------
 1 file changed, 42 insertions(+), 19 deletions(-)

diff --git a/neostrophic.vim b/neostrophic.vim
index 7e578df..93dc4a3 100644
--- a/neostrophic.vim
+++ b/neostrophic.vim
@@ -112,16 +112,42 @@ endfunction
 
 
 " Plugin configurations
-let g:airline_theme = 'powerlineish'
-let g:airline#extensions#branch#enabled = 1
-let g:airline_powerline_fonts = 0
-let g:airline#extensions#whitespace#enabled = 1
-let g:airline#extensions#hunks#non_zero_only = 1
-let g:airline#extensions#tabline#enabled = 1
+let g:lightline = {
+    \ 'active': {
+        \ 'left': [['mode', 'paste',], ['readonly', 'modified', 'fugitive'], ['bufferinfo'], ['bufferbefore', 'buffercurrent', 'bufferafter']],
+        \ },
+    \ 'component_expand': {
+        \ 'buffercurrent': 'lightline#buffer#buffercurrent2',
+        \ },
+    \ 'component_function': {
+        \ 'bufferbefore': 'lightline#buffer#bufferbefore',
+        \ 'bufferafter': 'lightline#buffer#bufferafter',
+        \ 'bufferinfo': 'lightline#buffer#bufferinfo',
+        \ 'fugitive': 'LlFugitive',
+        \ },
+      \ 'separator': { 'left': '>', 'right': '<' },
+      \ 'subseparator': { 'left': '>', 'right': '<' }
+    \ }
+function! LlFugitive()
+  return exists('*fugitive#head') ? fugitive#head() : ''
+endfunction
 
-let g:bufferline_echo = 0
-let g:bufferline_modified = '*'
-let g:bufferline_show_bufnr = 0
+let g:lightline_buffer_readonly_icon = ''
+let g:lightline_buffer_modified_icon = '+'
+let g:lightline_buffer_active_buffer_left_icon = '['
+let g:lightline_buffer_active_buffer_right_icon = ']'
+let g:lightline_buffer_separator_icon = ''
+
+let g:lightline_buffer_show_bufnr = 1
+let g:lightline_buffer_rotate = 0
+let g:lightline_buffer_fname_mod = ':t'
+let g:lightline_buffer_excludes = ['vimfiler']
+
+let g:lightline_buffer_maxflen = 30
+let g:lightline_buffer_maxfextlen = 3
+let g:lightline_buffer_minflen = 16
+let g:lightline_buffer_minfextlen = 3
+let g:lightline_buffer_reservelen = 20
 
 let g:molokai_original = 0
 let g:rehash256 = 1
@@ -171,9 +197,9 @@ Plug 'Shougo/echodoc.vim'
 Plug 'Shougo/unite.vim',                  {'on': 'Unite' }
 Plug 'Shougo/vimproc.vim',                {'do': 'make'}
 Plug 'airblade/vim-gitgutter'
-Plug 'bling/vim-bufferline'
-Plug 'digitaltoad/vim-jade',              {'for': ['jade', 'pug']}
+Plug 'digitaltoad/vim-pug',              {'for': ['jade', 'pug']}
 Plug 'elzr/vim-json',                     {'for': 'json'}
+Plug 'itchyny/lightline.vim'
 Plug 'jelera/vim-javascript-syntax',      {'for': 'javascript'}
 Plug 'jmcantrell/vim-virtualenv'
 Plug 'junegunn/goyo.vim',                 {'on': 'Goyo'}
@@ -191,10 +217,9 @@ Plug 'mikroskeem/vim-sk-syntax',          {'for': 'skript'}
 Plug 'nelstrom/vim-markdown-folding',     {'for': 'markdown'}
 Plug 'scrooloose/nerdtree',               {'on': 'NERDTreeToggle'}
 Plug 'scrooloose/syntastic'
-Plug 'terryma/vim-smooth-scroll'
+Plug 'taohex/lightline-buffer'
+Plug 'tpope/vim-fugitive'
 Plug 'tpope/vim-markdown',                {'for': 'markdown'}
-Plug 'vim-airline/vim-airline'
-Plug 'vim-airline/vim-airline-themes'
 Plug 'vim-scripts/nginx.vim',             {'for': 'nginx'}
 Plug 'wavded/vim-stylus',                 {'for': 'stylus'}
 Plug 'zchee/deoplete-jedi'
@@ -274,11 +299,9 @@ nnoremap <silent> <F8> :TagbarToggle<CR>
 " xnoremap / nnoremap won't work here somehow
 xmap <leader>ga :EasyAlign<CR>
 nmap <leader>ga :EasyAlign<CR>
-" vim-smooth-scroll
-noremap <silent> <C-u> :call smooth_scroll#up(&scroll, 0, 2)<CR>
-noremap <silent> <C-d> :call smooth_scroll#down(&scroll, 0, 2)<CR>
-noremap <silent> <C-b> :call smooth_scroll#up(&scroll*2, 0, 4)<CR>
-noremap <silent> <C-f> :call smooth_scroll#down(&scroll*2, 0, 4)<CR>
+" GitGutter
+nmap <Leader>hr <Plug>GitGutterUndoHunk
+nmap <Leader>hp <Plug>GitGutterPrevHunk
 
 " Re-apply fake $MYVIMRC
 silent! call s:fake_vimrc()