Add basedpytight and more small tweaks

arunoruto · Dec 9, 2024 · 5e5f2a6 · 5e5f2a6
1 parent 2c378ce
commit 5e5f2a6
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 30 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/modules/home-manager/server/cli/btop.nix b/modules/home-manager/server/cli/btop.nix
@@ -1,5 +1,4 @@
 {
-  config,
   pkgs,
   lib,
   osConfig,
@@ -11,6 +10,8 @@
       enable = true;
       settings = {
         update_ms = 1000;
+        vim_keys = true;
+        graph_symbol = "braille";
       };
     }
     // lib.optionals (args ? nixosConfig) {

diff --git a/modules/home-manager/server/cli/helix/languages/python.nix b/modules/home-manager/server/cli/helix/languages/python.nix
@@ -73,22 +73,25 @@ in
           }
         ];
         language-server = {
-          pyright.config.python.analysis.typeCheckingMode = "basic";
+          pyright = {
+            command = lib.getExe pkgs.unstable.basedpyright;
+            config.python.analysis.typeCheckingMode = "basic";
+          };
           ruff = {
-            command = "ruff";
+            command = lib.getExe pkgs.unstable.ruff;
             args = [
               "server"
-              "--preview"
+              # "--preview"
             ];
           };
-          # pylsp.config.pylsp = {
-          #   plugins.ruff.enabled = true;
-          #   plugins.ruff.formatEnabled = true;
-          # };
         };
       };
       extraPackages = with pkgs; [
-        python311Packages.debugpy
+        (python3.withPackages (
+          ps: with ps; [
+            debugpy
+          ]
+        ))
         pyright
         unstable.ruff
         unstable.isort