From 46a8a443dc7a3c24b2c3ba2f79ed1b336cdb2cf9 Mon Sep 17 00:00:00 2001
From: Julien Malka <julien@malka.sh>
Date: Tue, 25 Jun 2024 10:12:15 +0200
Subject: [PATCH] chore: use upstream lix

---
 lib/mkmachine.nix       | 7 -------
 modules/nix/default.nix | 3 ++-
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/lib/mkmachine.nix b/lib/mkmachine.nix
index e3709ba..ec0be24 100644
--- a/lib/mkmachine.nix
+++ b/lib/mkmachine.nix
@@ -37,18 +37,11 @@ import "${nixpkgs}/nixos/lib/eval-config.nix" {
     (import "${inputs.impermanence}/nixos.nix")
     (import inputs.lanzaboote).nixosModules.lanzaboote
     (import inputs.lila).nixosModules.hash-collection
-    (import "${inputs.lix-module}/module.nix" { inherit (inputs) lix; })
     {
       home-manager.useGlobalPkgs = true;
       nixpkgs.system = system;
       networking.hostName = name;
       nixpkgs.overlays = lib.mkAfter [
-        # TODO: Remove when https://git.lix.systems/lix-project/lix/issues/310 is fixed
-        (_: prev: {
-          nix = prev.nix.overrideAttrs (_: {
-            doCheck = false;
-          });
-        })
         (overlay-unstable system)
         (_final: prev: {
           waybar = prev.waybar.overrideAttrs (oldAttrs: {
diff --git a/modules/nix/default.nix b/modules/nix/default.nix
index 87898a5..bb229ec 100644
--- a/modules/nix/default.nix
+++ b/modules/nix/default.nix
@@ -2,6 +2,7 @@
   config,
   lib,
   inputs,
+  pkgs,
   ...
 }:
 let
@@ -16,7 +17,7 @@ with lib;
   config = mkIf cfg.enable {
     nixpkgs.config.allowUnfree = true;
     nix = {
-      #package = pkgs.unstable.nix;
+      package = pkgs.unstable.lix;
       extraOptions = ''
         experimental-features = nix-command flakes
       '';