flake, nix: Use Lix from nixpkgs

common/nix.nix

@@ -9,4 +9,16 @@
   };
   nixpkgs.config.allowUnfree = true;
   nix.settings.trusted-users = [ "@wheel" ];
+
+  nix.package = pkgs.lixPackageSets.stable.lix;
+  nixpkgs.overlays = [
+    (final: prev: {
+      inherit (final.lixPackageSets.stable)
+        nixpkgs-review
+        nix-direnv
+        nix-eval-jobs
+        nix-fast-build
+        colmena;
+    })
+  ];
 }

flake.lock

@@ -80,39 +80,6 @@
         "type": "github"
       }
     },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_2"
-      },
-      "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": [
@@ -154,43 +121,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_2",
-        "flakey-profile": "flakey-profile",
-        "lix": [
-          "lix"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1753282722,
-        "narHash": "sha256-KYMUrTV7H/RR5/HRnjV5R3rRIuBXMemyJzTLi50NFTs=",
-        "rev": "46a9e8fcfe4be72b4c7c8082ee11d2c42da1e873",
-        "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/46a9e8fcfe4be72b4c7c8082ee11d2c42da1e873.tar.gz?rev=46a9e8fcfe4be72b4c7c8082ee11d2c42da1e873"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.3-1.tar.gz"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1756617294,
@@ -316,8 +246,6 @@
         "flake-parts": "flake-parts",
         "home-manager": "home-manager",
         "home-manager-unstable": "home-manager-unstable",
-        "lix": "lix",
-        "lix-module": "lix-module",
         "nixpkgs": "nixpkgs",
         "nixpkgs-small": "nixpkgs-small",
         "nixpkgs-unstable": "nixpkgs-unstable",
@@ -362,21 +290,6 @@
         "repo": "default",
         "type": "github"
       }
-    },
-    "systems_2": {
-      "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",

flake.nix

@@ -4,19 +4,6 @@
     nixpkgs-small.url = "github:NixOS/nixpkgs/nixos-25.05-small";
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
     nixpkgs-unstable-small.url = "github:NixOS/nixpkgs/nixos-unstable-small";
-    
-    lix = {
-      # use unreleased 2.93 branch due to https://git.lix.systems/lix-project/lix/issues/943 until lix cuts a new 2.93.x release
-      url = "https://git.lix.systems/lix-project/lix/archive/release-2.93.tar.gz";
-      flake = false;
-    };
-
-    lix-module = {
-      # lix haven't figured out automatic updates yet: https://git.lix.systems/lix-project/nixos-module/issues/39
-      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.3-1.tar.gz";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.lix.follows = "lix";
-    };
 
     home-manager = {
       url = "github:nix-community/home-manager/release-25.05";
@@ -71,7 +58,7 @@
       perSystem = { pkgs, system, ... }: {
         devShells.default = pkgs.mkShell {
           packages = [
-            inputs.colmena.packages.${system}.colmena
+            pkgs.colmena
             inputs.agenix.packages.${system}.default
             inputs.plasma-manager.packages.${system}.rc2nix
           ];
@@ -121,12 +108,7 @@
         in
         {
           meta = {
-            nixpkgs = import nixpkgs-unstable {
+            nixpkgs = import nixpkgs-unstable { system = "x86_64-linux"; };
-              system = "x86_64-linux";
-              overlays = [
-                inputs.lix-module.overlays.default
-              ];
-            };
             nodeNixpkgs = {
               kilgharrah = import nixpkgs-unstable { system = "x86_64-linux"; };
               tohru = import nixpkgs { system = "x86_64-linux"; };
@@ -147,7 +129,6 @@
             deployment.buildOnTarget = lib.mkDefault true;
 
             imports = [
-              inputs.lix-module.nixosModules.default
               inputs.agenix.nixosModules.default
               ./common
               ./services