axeman/pub-solar-os
1
0
Fork 0
forked from pub-solar/os
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into b12f

Browse source
This commit is contained in:
Benjamin Bädorf 2021-11-08 00:07:14 +00:00
parent 7cb8b30fe4 3fa5612b37
commit decf354138
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
modules/terminal-life/default.nix
View file

@ -23,16 +23,17 @@ in
home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] { home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
home.packages = [ home.packages = [
ag
ack ack
ag
bat bat
exa exa
fd
gh gh
glow
nnn
powerline powerline
vifm vifm
watson watson
nnn
fd
]; ];
programs.neovim = import ./nvim { inherit config; inherit pkgs; }; programs.neovim = import ./nvim { inherit config; inherit pkgs; };

6
modules/terminal-life/nvim/lsp.vim
View file

@ -42,7 +42,9 @@ lua <<EOF
['workspace'] = vim.fn.stdpath('cache')..'/java-workspaces' ['workspace'] = vim.fn.stdpath('cache')..'/java-workspaces'
} }
}, },
'jsonls', ------------------------------- JSON ['jsonls'] = { -------------------------- JSON
['cmd'] = {"json-languageserver", "--stdio"}
},
'phpactor', ----------------------------- PHP 'phpactor', ----------------------------- PHP
'pyls', --------------------------------- Python 'pyls', --------------------------------- Python
'rnix', --------------------------------- Nix 'rnix', --------------------------------- Nix
@ -94,7 +96,7 @@ let g:diagnostic_trimmed_virtual_text = '40'
let g:diagnostic_insert_delay = 1 let g:diagnostic_insert_delay = 1
" Show diagnostic popup on cursor hold " Show diagnostic popup on cursor hold
autocmd CursorHold * lua vim.lsp.diagnostic.show_line_diagnostics() autocmd CursorHold * lua vim.lsp.diagnostic.show_line_diagnostics({ focusable = false })
" Goto previous/next diagnostic warning/error " Goto previous/next diagnostic warning/error
" nnoremap <silent> g[ <cmd>PrevDiagnosticCycle<cr> " nnoremap <silent> g[ <cmd>PrevDiagnosticCycle<cr>