pub-solar/os
5
0
Fork 2
Code Issues 4 Pull requests Packages Projects 1 Releases Wiki Activity

Shiny cherrypicks from teutat3s branch #231

Merged
b12f merged 13 commits from main-cherrypick-from-teutat3s into main 2023-07-13 14:15:06 +00:00
Conversation 0 Commits 13 Files changed 17 +6 -3
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit ea69c1d12c - Show all commits

4
modules/terminal-life/nvim/default.nix
View file

@ -25,6 +25,7 @@ in {
ansible-language-server ansible-language-server
ccls ccls
gopls gopls
nixd
nodejs nodejs
nodePackages.bash-language-server nodePackages.bash-language-server
nodePackages.dockerfile-language-server-nodejs nodePackages.dockerfile-language-server-nodejs
@ -37,9 +38,8 @@ in {
nodePackages.yaml-language-server nodePackages.yaml-language-server
python3Packages.python-lsp-server python3Packages.python-lsp-server
python3Full python3Full
solargraph
rnix-lsp
rust-analyzer rust-analyzer
solargraph
terraform-ls terraform-ls
universal-ctags universal-ctags
]; ];

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

@ -122,9 +122,9 @@ lua <<EOF
} }
} }
}, },
'nixd', --------------------------------- Nix
'phpactor', ----------------------------- PHP 'phpactor', ----------------------------- PHP
'pylsp', -------------------------------- Python 'pylsp', -------------------------------- Python
'rnix', --------------------------------- Nix
'solargraph', --------------------------- Ruby 'solargraph', --------------------------- Ruby
'rust_analyzer', ------------------------ Rust 'rust_analyzer', ------------------------ Rust
['sqlls'] = { ['sqlls'] = {

3
overlays/overrides.nix
View file

@ -3,6 +3,7 @@ channels: final: prev: {
inherit inherit
(channels.latest) (channels.latest)
nixd
; ;
haskellPackages = haskellPackages =
@ -18,4 +19,6 @@ channels: final: prev: {
; ;
}); });
}); });
vimPlugins = prev.vimPlugins // {inherit (channels.latest.vimPlugins) nvim-lspconfig;};
} }