From 11ac1b84b78831ed590356b214246d350b66cbac Mon Sep 17 00:00:00 2001
From: Tim Schubert <dadada@dadada.li>
Date: Fri, 20 Sep 2024 18:23:32 +0200
Subject: [PATCH] feat: upgrade to Lix

---
 flake.lock               | 53 ++++++++++++++++++++++++++++++++++++++++
 flake.nix                |  5 ++++
 nixos/configurations.nix | 14 ++++++++---
 outputs.nix              |  1 +
 4 files changed, 69 insertions(+), 4 deletions(-)

diff --git a/flake.lock b/flake.lock
index aa39a63..9cc797c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -101,6 +101,21 @@
         "type": "github"
       }
     },
+    "flakey-profile": {
+      "locked": {
+        "lastModified": 1712898590,
+        "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
+        "owner": "lf-",
+        "repo": "flakey-profile",
+        "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lf-",
+        "repo": "flakey-profile",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -157,6 +172,43 @@
         "url": "https://git.dadada.li/dadada/dadada.li/archive/main.tar.gz"
       }
     },
+    "lix": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1723503926,
+        "narHash": "sha256-Rosl9iA9MybF5Bud4BTAQ9adbY81aGmPfV8dDBGl34s=",
+        "rev": "bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2",
+        "type": "tarball",
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2.tar.gz?rev=bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://git.lix.systems/lix-project/lix/archive/2.91.0.tar.gz"
+      }
+    },
+    "lix-module": {
+      "inputs": {
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "flakey-profile": "flakey-profile",
+        "lix": "lix",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1723510904,
+        "narHash": "sha256-zNW/rqNJwhq2lYmQf19wJerRuNimjhxHKmzrWWFJYts=",
+        "rev": "622a2253a071a1fb97a4d3c8103a91114acc1140",
+        "type": "tarball",
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/622a2253a071a1fb97a4d3c8103a91114acc1140.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz"
+      }
+    },
     "nixlib": {
       "locked": {
         "lastModified": 1726362065,
@@ -249,6 +301,7 @@
         "flake-utils": "flake-utils",
         "home-manager": "home-manager_2",
         "homepage": "homepage",
+        "lix-module": "lix-module",
         "nixos-generators": "nixos-generators",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
diff --git a/flake.nix b/flake.nix
index 1e28a54..5e512b9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -25,6 +25,11 @@
       url = "github:numtide/devshell";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    lix-module = {
+      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-utils.follows = "flake-utils";
+    };
     nixos-generators = {
       url = "github:nix-community/nixos-generators";
       inputs.nixpkgs.follows = "nixpkgs";
diff --git a/nixos/configurations.nix b/nixos/configurations.nix
index 41aabe8..040ec6b 100644
--- a/nixos/configurations.nix
+++ b/nixos/configurations.nix
@@ -1,5 +1,6 @@
 { self
 , agenix
+, lix-module
 , nixpkgs
 , nixpkgs-full
 , home-manager
@@ -9,13 +10,17 @@
 , ...
 }@inputs:
 let
+  lixModule = lix-module.nixosModules.default;
+
   nixosSystem = { n_nixpkgs ? nixpkgs, system ? "x86_64-linux", extraModules ? [ ] }: n_nixpkgs.lib.nixosSystem {
     inherit system;
 
-    modules = [{
-
-      nixpkgs.overlays = n_nixpkgs.lib.attrValues self.overlays;
-    }] ++ (n_nixpkgs.lib.attrValues self.nixosModules) ++ [ agenix.nixosModules.age ] ++ extraModules;
+    modules = [
+      lixModule
+      {
+        nixpkgs.overlays = n_nixpkgs.lib.attrValues self.overlays;
+      }
+    ] ++ (n_nixpkgs.lib.attrValues self.nixosModules) ++ [ agenix.nixosModules.age ] ++ extraModules;
   };
 in
 {
@@ -68,6 +73,7 @@ in
   installer = nixpkgs.lib.nixosSystem {
     system = "x86_64-linux";
     modules = [
+      lixModule
       nixos-generators.nixosModules.install-iso
       self.nixosModules.admin
       {
diff --git a/outputs.nix b/outputs.nix
index b96b7bb..efa3dab 100644
--- a/outputs.nix
+++ b/outputs.nix
@@ -3,6 +3,7 @@
 , flake-utils
 , flake-registry
 , homepage
+, lix-module
 , nixpkgs
 , home-manager
 , nixos-hardware