From 5e5f2a69739fa9a5705a5b0c5787b34b391c4bd4 Mon Sep 17 00:00:00 2001
From: Mirza Arnaut <mirza.arnaut45@gmail.com>
Date: Tue, 10 Dec 2024 00:38:05 +0100
Subject: [PATCH] Add basedpytight and more small tweaks

---
 flake.lock                                    | 42 +++++++++----------
 modules/home-manager/server/cli/btop.nix      |  3 +-
 .../server/cli/helix/languages/python.nix     | 19 +++++----
 3 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/flake.lock b/flake.lock
index f2f85a6..433de69 100644
--- a/flake.lock
+++ b/flake.lock
@@ -295,11 +295,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1733238479,
-        "narHash": "sha256-o5BT2ziQJzoXrqBz/iOIOGoxDTXYd5KiNF/7ncN81ao=",
+        "lastModified": 1733656469,
+        "narHash": "sha256-Eycc+MhSCoFsy0KagOQt5F1fK9vF2hyn4TneZRc3FLE=",
         "owner": "helix-editor",
         "repo": "helix",
-        "rev": "fa68bac391e576e659e306ce3fb2758d3ec68538",
+        "rev": "db1d84256fbae21abb3ba46943fb1abb8e211355",
         "type": "github"
       },
       "original": {
@@ -315,11 +315,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733050161,
-        "narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=",
+        "lastModified": 1733572789,
+        "narHash": "sha256-zjO6m5BqxXIyjrnUziAzk4+T4VleqjstNudSqWcpsHI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "62d536255879be574ebfe9b87c4ac194febf47c5",
+        "rev": "c7ffc9727d115e433fd884a62dc164b587ff651d",
         "type": "github"
       },
       "original": {
@@ -384,11 +384,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733143273,
-        "narHash": "sha256-pVogdQb09YrbVyFrzadfF1fseT6W2We4lNKRvWPPHsY=",
+        "lastModified": 1733733360,
+        "narHash": "sha256-q6pp7uqkAxbsENjJr2U7vPVEoLX0m7ouCTBg/0J5v3g=",
         "owner": "Mic92",
         "repo": "nix-ld",
-        "rev": "1e17dfe486a0c4dc245f5177a7328930b8392b34",
+        "rev": "0c74021f8e3779a68684e893a5fb9a72078d5e18",
         "type": "github"
       },
       "original": {
@@ -414,11 +414,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1733217105,
-        "narHash": "sha256-fc6jTzIwCIVWTX50FtW6AZpuukuQWSEbPiyg6ZRGWFY=",
+        "lastModified": 1733481457,
+        "narHash": "sha256-IS3bxa4N1VMSh3/P6vhEAHQZecQ3oAlKCDvzCQSO5Is=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "cceee0a31d2f01bcc98b2fbd591327c06a4ea4f9",
+        "rev": "e563803af3526852b6b1d77107a81908c66a9fcf",
         "type": "github"
       },
       "original": {
@@ -461,11 +461,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1733212471,
-        "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=",
+        "lastModified": 1733581040,
+        "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776",
+        "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01",
         "type": "github"
       },
       "original": {
@@ -477,11 +477,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1733120037,
-        "narHash": "sha256-En+gSoVJ3iQKPDU1FHrR6zIxSLXKjzKY+pnh9tt+Yts=",
+        "lastModified": 1733550349,
+        "narHash": "sha256-NcGumB4Lr6KSDq+nIqXtNA8QwAQKDSZT7N9OTGWbTrs=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "f9f0d5c5380be0a599b1fb54641fa99af8281539",
+        "rev": "e2605d0744c2417b09f8bf850dfca42fcf537d34",
         "type": "github"
       },
       "original": {
@@ -750,11 +750,11 @@
     },
     "ucodenix": {
       "locked": {
-        "lastModified": 1733146393,
-        "narHash": "sha256-jmZKbnBFrfzFYFVtzeJIdS1XT9mAuxbDT2Y5hfrb0Ks=",
+        "lastModified": 1733351763,
+        "narHash": "sha256-0VzlIIE+78t0YptH5lkkrIy8FwM1Z9Hkn75n9RTF5Hc=",
         "owner": "e-tho",
         "repo": "ucodenix",
-        "rev": "a665cfe1ccd702c3acacc405d64e392b5fdd101b",
+        "rev": "56c73f68361ae713be920bd221592c381f82fa23",
         "type": "github"
       },
       "original": {
diff --git a/modules/home-manager/server/cli/btop.nix b/modules/home-manager/server/cli/btop.nix
index 8783440..9c9730b 100644
--- 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
index e447822..e41dc97 100644
--- 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