diff --git a/nvim/init.vim b/nvim/init.vim index 46713d6..a65dbca 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -5,6 +5,7 @@ Plug 'junegunn/fzf' Plug 'junegunn/fzf.vim' Plug 'tpope/vim-commentary' Plug 'itchyny/lightline.vim' +Plug 'itchyny/vim-gitbranch' Plug 'airblade/vim-gitgutter' Plug 'hashivim/vim-terraform' Plug 'bitc/vim-bad-whitespace' @@ -76,22 +77,33 @@ let g:gitgutter_sign_modified = '~' let g:Hexokinase_highlighters = [ 'backgroundfull' ] let g:lightline = { - \ 'colorscheme': 'ayu', \ 'active': { \ 'left': [ [ 'mode', 'paste' ], - \ [ 'readonly', 'filename' ] ], + \ [ 'readonly', 'gitbranch', 'filename' ] ], \ 'right': [ [ 'lineinfo' ], \ [ 'percent' ], \ [ 'filetype' ] ] \ }, \ 'component_function': { - \ 'readonly': 'LightLineReadonly'}, + \ 'readonly': 'LightLineReadonly', + \ 'filename': 'LightLineFilename', + \ 'gitbranch': 'gitbranch#name' + \ } \ } function! LightLineReadonly() return &readonly && &filetype !=# 'help' ? '' : '' endfunction +function! LightLineFilename() + let root = fnamemodify(get(b:, 'gitbranch_path'), ':h:h') + let path = expand('%:p') + if path[:len(root)-1] ==# root + return path[len(root)+1:] + endif + return expand('%') +endfunction + if filereadable(glob('~/.local/config/init.vim')) source ~/.local/config/init.vim endif