From eb75a0919ad8c996e3255caf0d7f5161eac2342e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= <lotte@chir.rs>
Date: Mon, 6 May 2024 16:16:37 +0100
Subject: [PATCH] add lix

---
 config/nix.nix |  2 ++
 flake.lock     | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++
 flake.nix      | 11 +++++++++
 3 files changed, 74 insertions(+)

diff --git a/config/nix.nix b/config/nix.nix
index 34e5c9eb..1d142f22 100644
--- a/config/nix.nix
+++ b/config/nix.nix
@@ -19,6 +19,7 @@
       substituters = [
         "https://attic.chir.rs/chir-rs/"
         "https://hydra.int.chir.rs"
+        "https://cache.lix.systems"
       ];
       trusted-public-keys = [
         "nixcache:8KKuGz95Pk4UJ5W/Ni+pN+v+LDTkMMFV4yrGmAYgkDg="
@@ -26,6 +27,7 @@
         "chir-rs:rzK1Czm3RqBbZLnXYrLM6JyOhfr6Z/8lhACIPO/LNFQ="
         "riscv:TZX1ReuoIGt7QiSQups+92ym8nKJUSV0O2NkS4HAqH8="
         "cache.ztier.link-1:3P5j2ZB9dNgFFFVkCQWT3mh0E+S3rIWtZvoql64UaXM="
+        "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
       ];
     };
     extraOptions = ''
diff --git a/flake.lock b/flake.lock
index 3166626e..6bd682fe 100644
--- a/flake.lock
+++ b/flake.lock
@@ -447,6 +447,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"
+      }
+    },
     "gomod2nix": {
       "inputs": {
         "nixpkgs": [
@@ -547,6 +562,50 @@
         "type": "github"
       }
     },
+    "lix": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1714955862,
+        "narHash": "sha256-REWlo2RYHfJkxnmZTEJu3Cd/2VM+wjjpPy7Xi4BdDTQ=",
+        "ref": "refs/tags/2.90-beta.1",
+        "rev": "b6799ab0374a8e1907a48915d3187e07da41d88c",
+        "revCount": 15501,
+        "type": "git",
+        "url": "https://git@git.lix.systems/lix-project/lix"
+      },
+      "original": {
+        "ref": "refs/tags/2.90-beta.1",
+        "type": "git",
+        "url": "https://git@git.lix.systems/lix-project/lix"
+      }
+    },
+    "lix-module": {
+      "inputs": {
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "flakey-profile": "flakey-profile",
+        "lix": [
+          "lix"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1714868057,
+        "narHash": "sha256-Q9vGkxmuarySjPKO6yixjZ0tkaVIQS2wU9FpCpDA7+I=",
+        "ref": "refs/heads/main",
+        "rev": "e31baf57680bab449ab5b40179cc4a08a99f5314",
+        "revCount": 62,
+        "type": "git",
+        "url": "https://git.lix.systems/lix-project/nixos-module"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.lix.systems/lix-project/nixos-module"
+      }
+    },
     "lowdown-src": {
       "flake": false,
       "locked": {
@@ -834,6 +893,8 @@
         "hydra": "hydra",
         "impermanence": "impermanence",
         "lib-aggregate": "lib-aggregate",
+        "lix": "lix",
+        "lix-module": "lix-module",
         "matrix-js-sdk": "matrix-js-sdk",
         "matrix-react-sdk": "matrix-react-sdk",
         "mozilla": "mozilla",
diff --git a/flake.nix b/flake.nix
index 94dfa360..67245ebd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -110,6 +110,16 @@ rec {
       inputs.flake-utils.follows = "flake-utils";
       inputs.nixpkgs-lib.follows = "nixpkgs";
     };
+    lix = {
+      url = "git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.90-beta.1";
+      flake = false;
+    };
+    lix-module = {
+      url = "git+https://git.lix.systems/lix-project/nixos-module";
+      inputs.lix.follows = "lix";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-utils.follows = "flake-utils";
+    };
     matrix-react-sdk = {
       url = "github:DarkKirb/matrix-react-sdk";
       inputs.flake-parts.follows = "flake-parts";
@@ -294,6 +304,7 @@ rec {
                 home-manager.extraSpecialArgs = args // {inherit system;};
               })
               (import utils/link-input.nix args)
+              args.lix-module.nixosModules.default
             ];
           };
       })