From 9942af482c2a6bfb8e9fabb0d7f9a88cf90373c4 Mon Sep 17 00:00:00 2001
From: Daylin Morgan <me@dayl.in>
Date: Mon, 6 May 2024 14:15:05 -0500
Subject: [PATCH] add lix

---
 flake.nix       |  9 +++++++++
 lib/default.nix | 13 +++++++++----
 modules/nix.nix |  2 +-
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/flake.nix b/flake.nix
index d13b9f3..398386b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,6 +4,13 @@
   outputs = inputs: (import ./lib inputs).oizysFlake;
 
   inputs = {
+    lix.url = "git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.90-beta.1";
+    lix.flake = false;
+
+    lix-module.url = "git+https://git.lix.systems/lix-project/nixos-module";
+    lix-module.inputs.lix.follows = "lix";
+    lix-module.inputs.nixpkgs.follows = "nixpkgs";
+
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
     stable.url = "github:nixos/nixpkgs/nixos-23.11";
 
@@ -36,12 +43,14 @@
       "https://hyprland.cachix.org"
       "https://nixpkgs-wayland.cachix.org"
       "https://daylin.cachix.org"
+      "https://cache.lix.systems"
       #   "https://cache.garnix.io"
     ];
     extra-trusted-public-keys = [
       "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
       "nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="
       "daylin.cachix.org-1:fLdSnbhKjtOVea6H9KqXeir+PyhO+sDSPhEW66ClE/k="
+      "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
       #   "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
     ];
   };
diff --git a/lib/default.nix b/lib/default.nix
index b4f35ee..2dea12c 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -32,10 +32,15 @@ rec {
     hostname:
     nixosSystem {
       system = "x86_64-linux";
-      modules = [
-        ../modules/oizys.nix
-        ../overlays
-      ] ++ filter isNixFile (listFilesRecursive (../. + "/hosts/${hostname}"));
+      modules =
+        [
+          ../modules/oizys.nix
+          ../overlays
+          inputs.lix-module.nixosModules.default
+        ]
+        ++ filter
+        isNixFile
+        (listFilesRecursive (../. + "/hosts/${hostname}"));
 
       specialArgs = {
         inherit
diff --git a/modules/nix.nix b/modules/nix.nix
index c91718a..672ec6d 100644
--- a/modules/nix.nix
+++ b/modules/nix.nix
@@ -8,7 +8,7 @@
   imports = [ inputs.nix-index-database.nixosModules.nix-index ];
 
   nixpkgs.config.allowUnfree = true;
-  nix.package = pkgs.nixVersions.latest;
+  # nix.package = pkgs.nixVersions.latest;
   nix.extraOptions = ''
     experimental-features = nix-command flakes
   '';