Merge branch 'master' of ssh://git.giugl.io/peperunas/nixos

roles/home/common.nix

@@ -11,11 +11,9 @@ let
     htop
     glances
     tree
-    direnv
-    devenv
   ] ++ lib.optional (!pkgs.stdenv.isDarwin) pastebinit;
 
-  unstablePkgs = with pkgs.unstablePkgs; [ aider-chat ];
+  unstablePkgs = with pkgs.unstablePkgs; [ aider-chat direnv devenv ];
 in
 {
   imports = [

roles/home/helix.nix

@@ -15,18 +15,15 @@ let
 
   py3 = actualPkgs.python3.withPackages (ps: with ps; [
     python-lsp-server
-    python-lsp-ruff
     pylsp-rope
     rope
-    mypy
-    pylsp-mypy
     black
+    ty
   ]);
 in
 {
   home = {
     packages = with actualPkgs; [
-      # black
       helix
       clang-tools
       rust-analyzer
@@ -40,6 +37,7 @@ in
       golangci-lint-langserver
       py3
       ruff
+      ty
       gh
       gofumpt
       taplo

roles/home/helix/languages.toml

@@ -6,10 +6,17 @@ language-servers = ["nixd"]
 [language-server.nixd]
 command = "nixd"
 
-[language-server.pylsp.config.pylsp.plugins]
-ruff = { enabled = true }
-rope = { enabled = true }
-mypy = { enabled = true }
+[[language]]
+name = "python"
+language-servers = ["ty", "ruff", "pylsp"]
+
+[language-server.ty]
+command = "ty"
+args = ["server"]
+
+[language-server.ruff]
+command = "ruff"
+args = ["server"]
 
 [[language]]
 name = "bash"