diff --git a/extras/dev.nix b/extras/dev.nix
index 8a83dac..b5af484 100644
--- a/extras/dev.nix
+++ b/extras/dev.nix
@@ -3,10 +3,16 @@
     pkgs,
     ...
 }: {
+    # systemd.user.services.lspmux = {
+    #     enable = true;
+    #     wantedBy = ["default.target"];
+    #     serviceConfig = {
+    #         Type = "simple";
+    #         ExecStart = "${pkgs.lspmux}/bin/lspmux server";
+    #     };
+    # };
     programs.qgroundcontrol.enable = true;
     environment.systemPackages = with pkgs; [
-        maturin
-        mission-planner
         # keep-sorted start sticky_comments=no
         # act
         # asm-lsp
@@ -42,7 +48,10 @@
         just-lsp
         keep-sorted
         lldb
+        lspmux
+        maturin
         mergiraf
+        mission-planner
         qFlipper
         qemu
         sd
diff --git a/flake.nix b/flake.nix
index d893db3..601fb4d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -31,6 +31,11 @@
         lsfg-vk-flake.inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    nixConfig = {
+        extra-substituters = ["https://helix.cachix.org"];
+        extra-trusted-public-keys = ["helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs="];
+    };
+
     outputs = {
         nixos,
         self,
diff --git a/systems/BASED.nix b/systems/BASED.nix
index d32a94d..8bd3d2f 100644
--- a/systems/BASED.nix
+++ b/systems/BASED.nix
@@ -5,6 +5,20 @@
     modulesPath,
     ...
 }: {
+    nixpkgs.overlays = [
+        (final: prev: {
+            inherit
+                (prev.lixPackageSets.stable)
+                nixpkgs-review
+                nix-eval-jobs
+                nix-fast-build
+                colmena
+                ;
+        })
+    ];
+
+    nix.package = pkgs.lixPackageSets.stable.lix;
+
     programs.pmount.enable = true;
     environment.systemPackages = with pkgs; [
         # keep-sorted start
diff --git a/users/tao/helix.nix b/users/tao/helix.nix
index a234440..68a736d 100644
--- a/users/tao/helix.nix
+++ b/users/tao/helix.nix
@@ -235,6 +235,10 @@
                 # keep-sorted end
             ];
             language-server = {
+                # lspmux = {
+                #     command = "lspmux";
+                # };
+
                 basedpyright = {
                     command = "basedpyright-langserver";
                     args = ["--stdio"];
@@ -273,6 +277,7 @@
             language-servers = {
                 rust-analyzer.config = {
                     server.path = "/home/tao/.cargo/bin/rust-analyzer";
+                    # server.path = "${pkgs.lspmux}/bin/lspmux";
                     procMacro = {
                         ignored = {
                             leptos_macro = [