diff --git a/roles/home/common.nix b/roles/home/common.nix index e41a4b3..0ca0411 100644 --- a/roles/home/common.nix +++ b/roles/home/common.nix @@ -17,7 +17,6 @@ ydiff nix-index pipenv - python3 htop glances tree diff --git a/roles/home/helix.nix b/roles/home/helix.nix index 0eeeab2..32948cf 100644 --- a/roles/home/helix.nix +++ b/roles/home/helix.nix @@ -11,6 +11,13 @@ let typescript-language-server bash-language-server ]; + + py3 = actualPkgs.python3.withPackages (ps: with ps; [ + python-lsp-server + python-lsp-ruff + pylsp-rope + rope + ]); in { home = { @@ -22,15 +29,13 @@ in nil texlab nixpkgs-fmt - ruff - ruff-lsp - mypy shellcheck shfmt gopls golangci-lint golangci-lint-langserver - pyright + py3 + ruff ] ++ nodePkgs; sessionVariables = { @@ -68,6 +73,10 @@ in name = "nix" formatter = { command = "nixpkgs-fmt" } + [language-server.pylsp.config.pylsp.plugins] + ruff = {enabled = true} + rope = {enabled = true} + [[language]] name = "go" language-servers = ["gopls", "golangci-lint-langserver"] @@ -76,8 +85,7 @@ in command = "golangci-lint-langserver" [language-server.golangci-lint-langserver.config] - command = ["golangci-lint", "run","--enable-all", "-D", "godox", "-D", "godot", "--out-format", "json", "--issues-exit-code=1"] - + command = ["golangci-lint", "run", "--out-format", "json", "--issues-exit-code=1"] ''; }; };