helix: switch to pyright and ruff-lsp

This commit is contained in:
Giulio De Pasquale 2024-02-21 15:13:20 +00:00
parent 2bd240a4e1
commit fa5d2bcc76

View File

@ -1,21 +1,41 @@
{ pkgs, ... }: { pkgs, ... }:
let let
pythonPkgs = with pkgs.python3Packages; [ actualPkgs = pkgs.unstablePkgs;
pythonPkgs = with actualPkgs.python3Packages; [
python-lsp-server python-lsp-server
python-lsp-ruff python-lsp-ruff
pylsp-mypy
]; ];
nodePkgs = with pkgs.nodePackages; [ nodePkgs = with actualPkgs.nodePackages; [
vscode-langservers-extracted vscode-langservers-extracted
typescript typescript
svelte-language-server svelte-language-server
yaml-language-server yaml-language-server
typescript-language-server typescript-language-server
bash-language-server bash-language-server
pyright
]; ];
in in
{ {
home = { home = {
packages = with actualPkgs; [
black
helix
clang-tools
rust-analyzer
nil
texlab
nixpkgs-fmt
ruff
ruff-lsp
mypy
shellcheck
shfmt
gopls
# ] ++ pythonPkgs ++ nodePkgs;
] ++ nodePkgs;
sessionVariables = { sessionVariables = {
EDITOR = "hx"; EDITOR = "hx";
VISUAL = "hx"; VISUAL = "hx";
@ -53,25 +73,22 @@ in
[[language]] [[language]]
name = "python" name = "python"
formatter = { command = "black", args = [ "-" ] } formatter = { command = "black", args = [ "-" ] }
language-servers = [ {name = "pyright"}, {name = "ruff-lsp"}, ]
[language-server.pyright]
command = "pyright-langserver"
args = ["--stdio"]
config = {}
[language-server.ruff-lsp]
command = "ruff-lsp"
args = []
config = {}
[[language]] [[language]]
name = "bash" name = "bash"
indent = { tab-width = 2, unit = " " } indent = { tab-width = 2, unit = " " }
formatter = { command = 'shfmt', args = ["-i", "2"] } formatter = { command = 'shfmt', args = ["-i", "2"] }
''; '';
packages = with pkgs.unstablePkgs; [
black
helix
clang-tools
rust-analyzer
nil
texlab
nixpkgs-fmt
ruff
shellcheck
shfmt
gopls
] ++ pythonPkgs ++ nodePkgs;
}; };
} }