diff --git a/applications/_base.nix b/applications/_base.nix index c9f7f61..79a83df 100644 --- a/applications/_base.nix +++ b/applications/_base.nix @@ -70,6 +70,9 @@ in { } ]; + # use lix instead of nix + nix.package = pkgs.lixPackageSets.stable.lix; + # set networking = { hostName = cfg.host.name; diff --git a/flake.lock b/flake.lock index 79f9311..325fe34 100644 --- a/flake.lock +++ b/flake.lock @@ -47,7 +47,7 @@ "inputs": { "fenix": "fenix_2", "flakeCompat": "flakeCompat_2", - "nixpkgs": "nixpkgs_25" + "nixpkgs": "nixpkgs_24" }, "locked": { "lastModified": 1719514321, @@ -314,24 +314,6 @@ "type": "github" } }, - "flake-utils_3": { - "inputs": { - "systems": "systems_5" - }, - "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "flakeCompat": { "flake": false, "locked": { @@ -364,21 +346,6 @@ "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" - } - }, "git-hooks": { "inputs": { "flake-compat": [ @@ -464,39 +431,6 @@ "type": "github" } }, - "lix": { - "flake": false, - "locked": { - "lastModified": 1751235704, - "narHash": "sha256-Jzm3KPZ2gL+0Nl3Mw/2E0B3vqDDi1Xt5+9VCXghUDZ8=", - "rev": "f3a7bbe5f8d1a8504ddb6362d50106904523e440", - "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/f3a7bbe5f8d1a8504ddb6362d50106904523e440.tar.gz?rev=f3a7bbe5f8d1a8504ddb6362d50106904523e440" - }, - "original": { - "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/release-2.93.tar.gz" - } - }, - "lix-module": { - "inputs": { - "flake-utils": "flake-utils_3", - "flakey-profile": "flakey-profile", - "lix": "lix", - "nixpkgs": "nixpkgs_7" - }, - "locked": { - "lastModified": 1751240025, - "narHash": "sha256-SXUAlxpjPRkArRMHy5+Hdi+PiC+ND9yzzIjiaHmTvQU=", - "rev": "8b1094356f4723d6e89d3f8a95b333ee16d9ab02", - "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/8b1094356f4723d6e89d3f8a95b333ee16d9ab02.tar.gz?rev=8b1094356f4723d6e89d3f8a95b333ee16d9ab02" - }, - "original": { - "type": "tarball", - "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.2-1.tar.gz" - } - }, "naersk": { "inputs": { "nixpkgs": "nixpkgs_4" @@ -517,7 +451,7 @@ }, "naersk_2": { "inputs": { - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1721727458, @@ -535,7 +469,7 @@ }, "naersk_3": { "inputs": { - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1745925850, @@ -553,7 +487,7 @@ }, "naersk_4": { "inputs": { - "nixpkgs": "nixpkgs_13" + "nixpkgs": "nixpkgs_12" }, "locked": { "lastModified": 1739824009, @@ -671,21 +605,6 @@ } }, "nixpkgs_10": { - "locked": { - "lastModified": 1722995383, - "narHash": "sha256-UzuXo7ZM8ZK0SkWFhHocKkLSGQPHS4JxaE1jvVR4fUo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "957d95fc8b9bf1eb60d43f8d2eba352b71bbf2be", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" - } - }, - "nixpkgs_11": { "locked": { "lastModified": 1750731501, "narHash": "sha256-Ah4qq+SbwMaGkuXCibyg+Fwn00el4KmI3XFX6htfDuk=", @@ -701,7 +620,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_11": { "locked": { "lastModified": 1750506804, "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=", @@ -716,7 +635,7 @@ "type": "indirect" } }, - "nixpkgs_13": { + "nixpkgs_12": { "locked": { "lastModified": 1741462378, "narHash": "sha256-ZF3YOjq+vTcH51S+qWa1oGA9FgmdJ67nTNPG2OIlXDc=", @@ -730,7 +649,7 @@ "type": "indirect" } }, - "nixpkgs_14": { + "nixpkgs_13": { "locked": { "lastModified": 1741513245, "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", @@ -745,7 +664,7 @@ "type": "indirect" } }, - "nixpkgs_15": { + "nixpkgs_14": { "locked": { "lastModified": 1687274257, "narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=", @@ -759,7 +678,7 @@ "type": "indirect" } }, - "nixpkgs_16": { + "nixpkgs_15": { "locked": { "lastModified": 1724114134, "narHash": "sha256-V/w5MIQy4jTG/L7/V/AL2BF5gSEWCfxHVDQdzLBCV18=", @@ -773,6 +692,20 @@ "type": "indirect" } }, + "nixpkgs_16": { + "locked": { + "lastModified": 1741037377, + "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "02032da4af073d0f6110540c8677f16d4be0117f", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, "nixpkgs_17": { "locked": { "lastModified": 1741037377, @@ -803,11 +736,11 @@ }, "nixpkgs_19": { "locked": { - "lastModified": 1741037377, - "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=", + "lastModified": 1690026219, + "narHash": "sha256-oOduRk/kzQxOBknZXTLSEYd7tk+GoKvr8wV6Ab+t4AU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "02032da4af073d0f6110540c8677f16d4be0117f", + "rev": "f465da166263bc0d4b39dfd4ca28b777c92d4b73", "type": "github" }, "original": { @@ -832,20 +765,6 @@ } }, "nixpkgs_20": { - "locked": { - "lastModified": 1690026219, - "narHash": "sha256-oOduRk/kzQxOBknZXTLSEYd7tk+GoKvr8wV6Ab+t4AU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f465da166263bc0d4b39dfd4ca28b777c92d4b73", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_21": { "locked": { "lastModified": 1724114134, "narHash": "sha256-V/w5MIQy4jTG/L7/V/AL2BF5gSEWCfxHVDQdzLBCV18=", @@ -859,7 +778,7 @@ "type": "indirect" } }, - "nixpkgs_22": { + "nixpkgs_21": { "locked": { "lastModified": 1689935543, "narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=", @@ -873,7 +792,7 @@ "type": "indirect" } }, - "nixpkgs_23": { + "nixpkgs_22": { "locked": { "lastModified": 1724114134, "narHash": "sha256-V/w5MIQy4jTG/L7/V/AL2BF5gSEWCfxHVDQdzLBCV18=", @@ -887,7 +806,7 @@ "type": "indirect" } }, - "nixpkgs_24": { + "nixpkgs_23": { "locked": { "lastModified": 1695978539, "narHash": "sha256-lta5HToBZMWZ2hl5CautNSUgIZViR41QxN7JKbMAjgQ=", @@ -901,7 +820,7 @@ "type": "indirect" } }, - "nixpkgs_25": { + "nixpkgs_24": { "locked": { "lastModified": 1668226844, "narHash": "sha256-G/S4FBWDAqHeBS/hfXwUCJbnaKnrQFoeeKwzvZEOgxM=", @@ -917,7 +836,7 @@ "type": "github" } }, - "nixpkgs_26": { + "nixpkgs_25": { "locked": { "lastModified": 1724395761, "narHash": "sha256-zRkDV/nbrnp3Y8oCADf5ETl1sDrdmAW6/bBVJ8EbIdQ=", @@ -990,22 +909,6 @@ } }, "nixpkgs_7": { - "locked": { - "lastModified": 1749794982, - "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_8": { "locked": { "lastModified": 1751271578, "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", @@ -1020,7 +923,7 @@ "type": "indirect" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1723151389, "narHash": "sha256-9AVY0ReCmSGXHrlx78+1RrqcDgVSRhHUKDVV1LLBy28=", @@ -1034,6 +937,21 @@ "type": "indirect" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1722995383, + "narHash": "sha256-UzuXo7ZM8ZK0SkWFhHocKkLSGQPHS4JxaE1jvVR4fUo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "957d95fc8b9bf1eb60d43f8d2eba352b71bbf2be", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, "root": { "inputs": { "agenix": "agenix", @@ -1042,8 +960,7 @@ "colmena": "colmena", "compsoc_public": "compsoc_public", "flake-utils": "flake-utils_2", - "lix-module": "lix-module", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_7", "simple-nixos-mailserver": "simple-nixos-mailserver", "skynet_discord_bot": "skynet_discord_bot", "skynet_discord_bot_t-800": "skynet_discord_bot_t-800", @@ -1122,7 +1039,7 @@ "skynet_discord_bot": { "inputs": { "naersk": "naersk_2", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_9", "nixpkgs-mozilla": "nixpkgs-mozilla", "utils": "utils_3" }, @@ -1143,7 +1060,7 @@ "skynet_discord_bot_t-800": { "inputs": { "naersk": "naersk_3", - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_11", "nixpkgs-mozilla": "nixpkgs-mozilla_2", "utils": "utils_4" }, @@ -1164,7 +1081,7 @@ "skynet_ldap_backend": { "inputs": { "naersk": "naersk_4", - "nixpkgs": "nixpkgs_14", + "nixpkgs": "nixpkgs_13", "nixpkgs-mozilla": "nixpkgs-mozilla_3", "utils": "utils_5" }, @@ -1184,7 +1101,7 @@ }, "skynet_ldap_frontend": { "inputs": { - "nixpkgs": "nixpkgs_15", + "nixpkgs": "nixpkgs_14", "utils": "utils_6" }, "locked": { @@ -1203,7 +1120,7 @@ }, "skynet_website": { "inputs": { - "nixpkgs": "nixpkgs_16", + "nixpkgs": "nixpkgs_15", "utils": "utils_7" }, "locked": { @@ -1222,7 +1139,7 @@ }, "skynet_website_1996": { "inputs": { - "nixpkgs": "nixpkgs_17", + "nixpkgs": "nixpkgs_16", "utils": "utils_8" }, "locked": { @@ -1241,7 +1158,7 @@ }, "skynet_website_2003": { "inputs": { - "nixpkgs": "nixpkgs_18", + "nixpkgs": "nixpkgs_17", "utils": "utils_9" }, "locked": { @@ -1260,7 +1177,7 @@ }, "skynet_website_2006": { "inputs": { - "nixpkgs": "nixpkgs_19", + "nixpkgs": "nixpkgs_18", "utils": "utils_10" }, "locked": { @@ -1279,7 +1196,7 @@ }, "skynet_website_2016": { "inputs": { - "nixpkgs": "nixpkgs_20", + "nixpkgs": "nixpkgs_19", "utils": "utils_11" }, "locked": { @@ -1298,7 +1215,7 @@ }, "skynet_website_2022": { "inputs": { - "nixpkgs": "nixpkgs_21", + "nixpkgs": "nixpkgs_20", "utils": "utils_12" }, "locked": { @@ -1319,7 +1236,7 @@ }, "skynet_website_2023": { "inputs": { - "nixpkgs": "nixpkgs_22", + "nixpkgs": "nixpkgs_21", "utils": "utils_13" }, "locked": { @@ -1340,7 +1257,7 @@ }, "skynet_website_2024": { "inputs": { - "nixpkgs": "nixpkgs_23", + "nixpkgs": "nixpkgs_22", "utils": "utils_14" }, "locked": { @@ -1361,7 +1278,7 @@ }, "skynet_website_games": { "inputs": { - "nixpkgs": "nixpkgs_24", + "nixpkgs": "nixpkgs_23", "utils": "utils_15" }, "locked": { @@ -1381,7 +1298,7 @@ "skynet_website_wiki": { "inputs": { "alejandra": "alejandra_2", - "nixpkgs": "nixpkgs_26", + "nixpkgs": "nixpkgs_25", "utils": "utils_16" }, "locked": { @@ -1564,21 +1481,6 @@ "type": "github" } }, - "systems_19": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -1719,7 +1621,7 @@ }, "utils_10": { "inputs": { - "systems": "systems_13" + "systems": "systems_12" }, "locked": { "lastModified": 1731533236, @@ -1737,7 +1639,7 @@ }, "utils_11": { "inputs": { - "systems": "systems_14" + "systems": "systems_13" }, "locked": { "lastModified": 1689068808, @@ -1755,7 +1657,7 @@ }, "utils_12": { "inputs": { - "systems": "systems_15" + "systems": "systems_14" }, "locked": { "lastModified": 1710146030, @@ -1773,7 +1675,7 @@ }, "utils_13": { "inputs": { - "systems": "systems_16" + "systems": "systems_15" }, "locked": { "lastModified": 1689068808, @@ -1791,7 +1693,7 @@ }, "utils_14": { "inputs": { - "systems": "systems_17" + "systems": "systems_16" }, "locked": { "lastModified": 1710146030, @@ -1809,7 +1711,7 @@ }, "utils_15": { "inputs": { - "systems": "systems_18" + "systems": "systems_17" }, "locked": { "lastModified": 1694529238, @@ -1827,7 +1729,7 @@ }, "utils_16": { "inputs": { - "systems": "systems_19" + "systems": "systems_18" }, "locked": { "lastModified": 1710146030, @@ -1863,7 +1765,7 @@ }, "utils_3": { "inputs": { - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1710146030, @@ -1881,7 +1783,7 @@ }, "utils_4": { "inputs": { - "systems": "systems_7" + "systems": "systems_6" }, "locked": { "lastModified": 1731533236, @@ -1899,7 +1801,7 @@ }, "utils_5": { "inputs": { - "systems": "systems_8" + "systems": "systems_7" }, "locked": { "lastModified": 1731533236, @@ -1917,7 +1819,7 @@ }, "utils_6": { "inputs": { - "systems": "systems_9" + "systems": "systems_8" }, "locked": { "lastModified": 1687171271, @@ -1935,7 +1837,7 @@ }, "utils_7": { "inputs": { - "systems": "systems_10" + "systems": "systems_9" }, "locked": { "lastModified": 1710146030, @@ -1953,7 +1855,7 @@ }, "utils_8": { "inputs": { - "systems": "systems_11" + "systems": "systems_10" }, "locked": { "lastModified": 1731533236, @@ -1971,7 +1873,7 @@ }, "utils_9": { "inputs": { - "systems": "systems_12" + "systems": "systems_11" }, "locked": { "lastModified": 1731533236, diff --git a/flake.nix b/flake.nix index 3ff66a7..3053145 100644 --- a/flake.nix +++ b/flake.nix @@ -7,11 +7,6 @@ # Return to using unstable once the current master is merged in # nixpkgs.url = "nixpkgs/nixos-unstable"; - lix-module = { - url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.2-1.tar.gz"; - # inputs.nixpkgs.follows = "nixpkgs"; - }; - # utility stuff flake-utils.url = "github:numtide/flake-utils"; agenix.url = "github:ryantm/agenix"; @@ -97,7 +92,18 @@ meta = { nixpkgs = import nixpkgs { system = "x86_64-linux"; - overlays = []; + overlays = [ + (final: prev: { + inherit + (final.lixPackageSets.stable) + nixpkgs-review + nix-direnv + nix-eval-jobs + nix-fast-build + colmena + ; + }) + ]; }; specialArgs = { inherit inputs self; diff --git a/machines/_base.nix b/machines/_base.nix index 632ee50..a8f53ff 100644 --- a/machines/_base.nix +++ b/machines/_base.nix @@ -19,9 +19,6 @@ in { # base application config for all servers ../applications/_base.nix - - # - inputs.lix-module.nixosModules.default ]; options.skynet = {