From 588779fa95a1ddefe5d734502f2c239bf5f87b0f Mon Sep 17 00:00:00 2001
From: Whovian9369 <Whovian9369@gmail.com>
Date: Tue, 25 Jun 2024 04:39:23 -0400
Subject: [PATCH] Swap to using Lix directly from `main`.

---
 flake.lock | 41 ++++++++++++++++++++---------------------
 flake.nix  | 12 +++++++++++-
 2 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/flake.lock b/flake.lock
index 86cb196..d29decf 100644
--- a/flake.lock
+++ b/flake.lock
@@ -85,11 +85,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718788307,
-        "narHash": "sha256-SqiOz0sljM0GjyQEVinPXQxaGcbOXw5OgpCWGPgh/vo=",
+        "lastModified": 1719180626,
+        "narHash": "sha256-vZAzm5KQpR6RGple1dzmSJw5kPivES2heCFM+ZWkt0I=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d7830d05421d0ced83a0f007900898bdcaf2a2ca",
+        "rev": "6b1f90a8ff92e81638ae6eb48cd62349c3e387bb",
         "type": "github"
       },
       "original": {
@@ -101,16 +101,15 @@
     "lix": {
       "flake": false,
       "locked": {
-        "lastModified": 1714955862,
-        "narHash": "sha256-REWlo2RYHfJkxnmZTEJu3Cd/2VM+wjjpPy7Xi4BdDTQ=",
-        "ref": "refs/tags/2.90-beta.1",
-        "rev": "b6799ab0374a8e1907a48915d3187e07da41d88c",
-        "revCount": 15501,
+        "lastModified": 1719261698,
+        "narHash": "sha256-0P9zg07Za+7B8bOgCYese2xU6dqutIyq7bT05wPl5HY=",
+        "ref": "refs/heads/main",
+        "rev": "d5637ee790799ffa00bcaa3067bb6940b6cbad16",
+        "revCount": 15880,
         "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"
       }
@@ -149,11 +148,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718507237,
-        "narHash": "sha256-xBEWCxWeRpWQggFFp8ugJCDa63cOJsVvx71R9F0Eowg=",
+        "lastModified": 1719111455,
+        "narHash": "sha256-rnIxHx+fLpydjMQsbpZ21kblUr/lMqSaAtMA4+qMMEE=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "6af2c5e58c20311276f59d247341cafeebfcb6f4",
+        "rev": "4293f532d0107dfb7e6f8b34a0421dc8111320e6",
         "type": "github"
       },
       "original": {
@@ -188,11 +187,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718710563,
-        "narHash": "sha256-O4rrM0Bkh3IRe8D600iniQ52QTmlnuTSp2KyXV7C2jE=",
+        "lastModified": 1719220171,
+        "narHash": "sha256-xywM6JoGT8AwfoOFJBTv8GRlvNu8LYqqqMS/OQ6uCgE=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "2fb93bea657ad99a7005ef601c67cb2820560a41",
+        "rev": "269411cfed6aab694e46f719277c972de96177bb",
         "type": "github"
       },
       "original": {
@@ -204,11 +203,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1718714799,
-        "narHash": "sha256-FUZpz9rg3gL8NVPKbqU8ei1VkPLsTIfAJ2fdAf5qjak=",
+        "lastModified": 1719075281,
+        "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c00d587b1a1afbf200b1d8f0b0e4ba9deb1c7f0e",
+        "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af",
         "type": "github"
       },
       "original": {
@@ -242,11 +241,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1717356499,
-        "narHash": "sha256-FnfuAc1yCQDw2UsChBHKDKtS3mo7DzKMqHKodwvmLzU=",
+        "lastModified": 1719236664,
+        "narHash": "sha256-AUXjPlfHpUQs+gKznmiHRaWZNWpKRNDE3R85oR/6hlY=",
         "owner": "Qyriad",
         "repo": "Xil",
-        "rev": "4940f0651a8f47afd4b07ff3e6b24f40113fcc46",
+        "rev": "563229c826e6b37a64e72d29154ab96e8ee18fcb",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 9ca6830..5db238a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -45,12 +45,22 @@
     ### Lix! Lix! Lix!
 
     lix = {
-      url = "git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.90-beta.1";
+      url = "git+https://git@git.lix.systems/lix-project/lix";
+        /*
+          Future me, the pattern for using Forgejo URLs is:
+          git+https://git@${domain}/${user_org}/${repo}?ref=refs/tags/${TAG}
+          git+https://git@${domain}/${user_org}/${repo}?rev=${commitHash}
+        */
       flake = false;
     };
 
     lix-module = {
       url = "git+https://git.lix.systems/lix-project/nixos-module";
+        /*
+          Future me, the pattern for using Forgejo URLs is:
+          git+https://git@${domain}/${user_org}/${repo}?ref=refs/tags/${TAG}
+          git+https://git@${domain}/${user_org}/${repo}?rev=${commitHash}
+        */
       inputs.lix.follows = "lix";
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.flake-utils.follows = "flake-utils";