diff --git a/home/default.nix b/home/default.nix index 2d22255..4a23438 100644 --- a/home/default.nix +++ b/home/default.nix @@ -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; } diff --git a/home/nvim/init.vim b/home/nvim/init.vim index cc703d0..aaa274a 100644 --- a/home/nvim/init.vim +++ b/home/nvim/init.vim @@ -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 diff --git a/home/nvim/statusline.vim b/home/nvim/statusline.vim deleted file mode 100644 index b96fa3b..0000000 --- a/home/nvim/statusline.vim +++ /dev/null @@ -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', - \ "\" : '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