From bd640d7c405cc319fcf4e61a61edf96a5dbf1c17 Mon Sep 17 00:00:00 2001
From: Mel <mel@rnrd.eu>
Date: Sat, 14 Feb 2026 21:45:52 +0100
Subject: Move Lix towards new nixpkgs configuration away from custom flake

Signed-off-by: Mel <mel@rnrd.eu>
---
 flake.lock      | 86 +--------------------------------------------------------
 flake.nix       | 10 -------
 modules/nix.nix |  4 +++
 3 files changed, 5 insertions(+), 95 deletions(-)

diff --git a/flake.lock b/flake.lock
index 2514b05..b383d47 100644
--- a/flake.lock
+++ b/flake.lock
@@ -95,39 +95,6 @@
         "type": "github"
       }
     },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_3"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "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": [
@@ -149,41 +116,6 @@
         "type": "github"
       }
     },
-    "lix": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1753306924,
-        "narHash": "sha256-jLCEW0FvjFhC+c4RHzH+xbkSOxrnpFHnhjOw6sudhx0=",
-        "rev": "1a4393d0aac31aba21f5737ede1b171e11336d77",
-        "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/1a4393d0aac31aba21f5737ede1b171e11336d77.tar.gz?rev=1a4393d0aac31aba21f5737ede1b171e11336d77"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/lix/archive/release-2.93.tar.gz"
-      }
-    },
-    "lix-module": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "flakey-profile": "flakey-profile",
-        "lix": "lix",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1756125859,
-        "narHash": "sha256-6a+PWILmqHCs9B5eIBLg6HSZ8jYweZpgOWO8FlyVwYI=",
-        "rev": "d3292125035b04df00d01549a26e948631fabe1e",
-        "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/d3292125035b04df00d01549a26e948631fabe1e.tar.gz?rev=d3292125035b04df00d01549a26e948631fabe1e"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.3-2.tar.gz"
-      }
-    },
     "nix-vscode-extensions": {
       "inputs": {
         "nixpkgs": [
@@ -243,7 +175,7 @@
     },
     "nixpkgs-esp-dev": {
       "inputs": {
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils",
         "nixpkgs": [
           "nixpkgs-unstable"
         ]
@@ -283,7 +215,6 @@
         "agenix": "agenix",
         "flake-compat": "flake-compat",
         "home-manager": "home-manager",
-        "lix-module": "lix-module",
         "nix-vscode-extensions": "nix-vscode-extensions",
         "nixos-apple-silicon": "nixos-apple-silicon",
         "nixpkgs": "nixpkgs",
@@ -320,21 +251,6 @@
         "repo": "default",
         "type": "github"
       }
-    },
-    "systems_3": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 0c436c7..eff0115 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,13 +3,6 @@
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
 
-    # TODO: lix is now recommending switching away from their own module flake
-    # towards the nixpkgs lix package set.
-    lix-module = {
-      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.3-2.tar.gz";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     home-manager = {
       url = "github:nix-community/home-manager/release-25.11";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -44,7 +37,6 @@
       self,
       nixpkgs,
       nixpkgs-unstable,
-      lix-module,
       nixos-apple-silicon,
       agenix,
       home-manager,
@@ -93,7 +85,6 @@
       ];
 
       overlays = [
-        lix-module.overlays.default
         nixos-apple-silicon.overlays.default # unused on non-asahi machines
         agenix.overlays.default
         nix-vscode-extensions.overlays.default
@@ -152,7 +143,6 @@
                   home-manager.users.mel = import ./machines/${machine.name}/home.nix;
                 }
 
-                lix-module.nixosModules.default
                 agenix.nixosModules.default
               ];
             };
diff --git a/modules/nix.nix b/modules/nix.nix
index 7314733..0a23cbd 100644
--- a/modules/nix.nix
+++ b/modules/nix.nix
@@ -1,5 +1,6 @@
 {
   me,
+  pkgs,
   lib,
   self,
   ...
@@ -18,6 +19,9 @@ let
 in
 {
   nix = {
+    # enable lix implementation
+    package = pkgs.lixPackageSets.stable.lix;
+
     # add compat scripts to the environment,
     # to allow nixos-option to find the configuration
     nixPath = [
-- 
cgit 1.4.1