From 05861c8a884fc3905dc06223228738401c2f07b5 Mon Sep 17 00:00:00 2001
From: Daylin Morgan <me@dayl.in>
Date: Mon, 20 Jan 2025 13:10:37 -0600
Subject: [PATCH] actually use the correct lix

---
 lib/default.nix          |  1 -
 modules/essentials.nix   |  2 ++
 overlays/lix/default.nix | 14 --------------
 pkgs/default.nix         |  2 +-
 pkgs/lix/default.nix     | 11 +++++++++++
 5 files changed, 14 insertions(+), 16 deletions(-)
 delete mode 100644 overlays/lix/default.nix
 create mode 100644 pkgs/lix/default.nix

diff --git a/lib/default.nix b/lib/default.nix
index f275507..28e12fb 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -65,7 +65,6 @@ let
         default = oizys;
         oizys = pkgs.callPackage ../pkgs/oizys { };
         iso = mkIso.config.system.build.isoImage;
-
         # nimlangserver = pkgs.callPackage ../pkgs/nim/nimlangserver { };
       }
       // (import ../pkgs { inherit pkgs lib; })
diff --git a/modules/essentials.nix b/modules/essentials.nix
index 11b6df5..5b94385 100644
--- a/modules/essentials.nix
+++ b/modules/essentials.nix
@@ -28,6 +28,8 @@
   ];
 
   nixpkgs.config.allowUnfree = true;
+  nix.package = (flake.pkgs "self").lix;
+
   nix = {
     optimise.automatic = true;
     gc = {
diff --git a/overlays/lix/default.nix b/overlays/lix/default.nix
deleted file mode 100644
index fbc88c9..0000000
--- a/overlays/lix/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ ... }:
-final: prev: {
-  lix =
-    (prev.lix.override {
-      aws-sdk-cpp = null;
-    }).overrideAttrs
-      (attrs: {
-        version = "${attrs.version}-oizys";
-
-        # probs a mistake ¯\_(ツ)_/¯ 
-        # surely they wouldn't push a broken CL....surely
-        doCheck = false;
-      });
-}
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 3e0a898..21a71a6 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -18,7 +18,7 @@ in
 
   attic-client = (flake.pkgs "lix-attic").attic-client;
   attic-server = (flake.pkgs "lix-attic").attic-server;
-  lix = (flake.pkgs "lix-module").default;
+  lix = pkgs.callPackage ./lix { inherit flake; };
 }
 // (flake.toPackageAttrs [
   "pixi"
diff --git a/pkgs/lix/default.nix b/pkgs/lix/default.nix
new file mode 100644
index 0000000..9968a9f
--- /dev/null
+++ b/pkgs/lix/default.nix
@@ -0,0 +1,11 @@
+{ flake, ... }:
+((flake.pkgs "lix-module").default.override {
+  aws-sdk-cpp = null;
+}).overrideAttrs
+  (attrs: {
+    version = "${attrs.version}-oizys";
+
+    # probs a mistake ¯\_(ツ)_/¯
+    # surely they wouldn't push a broken CL....surely
+    doCheck = false;
+  })