1 files changed, 23 insertions, 10 deletions
diff --git a/modules/nixos/base/nix.nix b/modules/nixos/base/nix.nix
index 87e93f4..b864a39 100644
--- a/modules/nixos/base/nix.nix
+++ b/modules/nixos/base/nix.nix
@@ -1,17 +1,30 @@
 { config, lib, pkgs, ... }:
 
 {
-  nix.settings = {
-    substituters = [
-      "https://cache.nixos.org/"
-    ];
+  nix = {
+    package = pkgs.lixPackageSets.stable.lix; # Use lix as the package manager instead of Nix
 
-    trusted-public-keys = [
-      "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
-    ];
-    experimental-features = [
-        "nix-command"
-        "flakes"
+    settings = {
+      substituters = [
+        "https://cache.nixos.org/"
       ];
+
+      trusted-public-keys = [
+        "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
+      ];
+      experimental-features = [
+          "nix-command"
+          "flakes"
+      ];
+    };
   };
+  # Fix nixkpgs.overlays being broken after switching to Lix from Nix
+  nixpkgs.overlays = [ (final: prev: {
+    inherit (prev.lixPackageSets.stable)
+      nixpkgs-review
+      nix-eval-jobs
+      nix-fast-build
+      colmena;
+  }) ];
+
 }