Use lualine

This commit is contained in:
Dave Gallant
2021-07-10 22:18:00 -04:00
parent 30da2b782b
commit 3196b19ff5
3 changed files with 3 additions and 56 deletions

View File

@@ -295,6 +295,7 @@ in
extraConfig = builtins.readFile ./nvim/init.vim;
plugins = with pkgs.vimPlugins; [
gruvbox
lualine-nvim
nerdtree
nvim-lspconfig
rust-vim
@@ -327,7 +328,6 @@ in
};
home.file.".config/nvim/statusline.vim".source = ./nvim/statusline.vim;
home.file.".config/srv/config.yml".source = ./srv/config.yml;
}

View File

@@ -133,6 +133,8 @@ autocmd FileType java setlocal omnifunc=javacomplete#Complete
let g:prettier#autoformat = 1
lua << EOF
require('lualine').setup()
require'lspconfig'.bashls.setup{}
require'lspconfig'.gopls.setup{}
require'lspconfig'.pyright.setup{}
@@ -143,4 +145,3 @@ require'lspconfig'.tflint.setup{}
require'lspconfig'.yamlls.setup{}
EOF
source ~/.config/nvim/statusline.vim

View File

@@ -1,54 +0,0 @@
" A lightweight statusline
" Enable statusline
set laststatus=2
" Do not show mode on last line
set noshowmode
function! ActivateStatusline()
set statusline=
set statusline+=%#Pmenu#
set statusline+=%{StatuslineMode()}
set statusline+=%#PmenuSel#
set statusline+=%#LineNr#
set statusline+=\ %f
set statusline+=%m
set statusline+=%=
set statusline+=%#CursorColumn#
set statusline+=\ %y
set statusline+=\ %{&fileencoding?&fileencoding:&encoding}
set statusline+=\[%{&fileformat}\]
set statusline+=\ %p%%
set statusline+=\ %l:%c
endfunction
" Get vim mode
function! StatuslineMode()
let g:modeMap={
\ 'n' : 'NORMAL',
\ 'i' : 'INSERT',
\ 'c' : 'COMMAND',
\ 'R' : 'REPLACE',
\ 's' : 'SELECT',
\ 'y' : 'HELP',
\ 't' : 'TERM',
\ '!' : 'SHELL',
\ 'v' : 'VISUAL',
\ 'V' : 'VISUAL LINE',
\ "\<C-V>" : 'VISUAL BLOCK'
\}
if expand('%:y') == 'help'
let b:CurrentMode = 'HELP'
endif
return ' '.g:modeMap[mode()].' '
endfunction
augroup SetStatusline
autocmd!
autocmd BufEnter,WinEnter * call ActivateStatusline()
augroup END