commit 026367bf78ca7ced9ee25b91f81d8afa82924cd2
parent 97d968a95811a9a590eaf4b0c58efacf791275ea
Author: Katja (ctucx) <git@ctu.cx>
Date: Thu, 6 Mar 2025 18:23:35 +0100
parent 97d968a95811a9a590eaf4b0c58efacf791275ea
Author: Katja (ctucx) <git@ctu.cx>
Date: Thu, 6 Mar 2025 18:23:35 +0100
flake: clean up inputs
2 files changed, 96 insertions(+), 231 deletions(-)
diff --git a/flake.lock b/flake.lock @@ -2,12 +2,18 @@ "nodes": { "agenix": { "inputs": { - "darwin": "darwin", - "home-manager": "home-manager", + "darwin": [ + "nixDarwin" + ], + "home-manager": [ + "homeManager" + ], "nixpkgs": [ "nixpkgs" ], - "systems": "systems" + "systems": [ + "nixSystemsDefault" + ] }, "locked": { "lastModified": 1736955230, @@ -41,8 +47,12 @@ }, "colmena": { "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", + "flake-compat": [ + "flakeCompat" + ], + "flake-utils": [ + "flakeUtils" + ], "nix-github-actions": "nix-github-actions", "nixpkgs": [ "nixpkgs" @@ -144,31 +154,11 @@ "url": "https://git.ctu.cx/website" } }, - "darwin": { - "inputs": { - "nixpkgs": [ - "agenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1700795494, - "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", - "type": "github" - }, - "original": { - "owner": "lnl7", - "ref": "master", - "repo": "nix-darwin", - "type": "github" - } - }, "dnsNix": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": [ + "flakeUtils" + ], "nixpkgs": [ "nixpkgs" ] @@ -204,46 +194,13 @@ "type": "github" } }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { - "flake": false, + "flakeCompat": { "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -252,19 +209,18 @@ "type": "github" } }, - "flake-parts": { + "flakeParts": { "inputs": { "nixpkgs-lib": [ - "lanzaboote", "nixpkgs" ] }, "locked": { - "lastModified": 1717285511, - "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", + "lastModified": 1740872218, + "narHash": "sha256-ZaMw0pdoUKigLpv9HiNDH2Pjnosg7NBYMJlHTIsHEUo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", + "rev": "3876f6b87db82f33775b1ef5ea343986105db764", "type": "github" }, "original": { @@ -273,57 +229,11 @@ "type": "github" } }, - "flake-utils": { - "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "locked": { - "lastModified": 1614513358, - "narHash": "sha256-LakhOx3S1dRjnh0b5Dg3mbZyH0ToC9I8Y2wKSkBaTzU=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5466c5bbece17adaab2d82fae80b46e807611bf3", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "flakeUtils": { "inputs": { - "systems": "systems_2" + "systems": [ + "nixSystemsDefault" + ] }, "locked": { "lastModified": 1731533236, @@ -339,7 +249,7 @@ "type": "github" } }, - "flakey-profile": { + "flakeyProfile": { "locked": { "lastModified": 1712898590, "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=", @@ -436,27 +346,6 @@ "type": "github" } }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "agenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1703113217, - "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, "homeManager": { "inputs": { "nixpkgs": [ @@ -496,9 +385,15 @@ "lanzaboote": { "inputs": { "crane": "crane", - "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts", - "flake-utils": "flake-utils_3", + "flake-compat": [ + "flakeCompat" + ], + "flake-parts": [ + "flakeParts" + ], + "flake-utils": [ + "flakeUtils" + ], "nixpkgs": [ "nixpkgs" ], @@ -539,7 +434,9 @@ "flake-utils": [ "flakeUtils" ], - "flakey-profile": "flakey-profile", + "flakey-profile": [ + "flakeyProfile" + ], "lix": "lix", "nixpkgs": [ "nixpkgs" @@ -654,19 +551,18 @@ "type": "github" } }, - "nixosHardware": { + "nixSystemsDefault": { "locked": { - "lastModified": 1740646007, - "narHash": "sha256-dMReDQobS3kqoiUCQIYI9c0imPXRZnBubX20yX/G5LE=", - "owner": "NixOS", - "repo": "nixos-hardware", - "rev": "009b764ac98a3602d41fc68072eeec5d24fc0e49", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "master", - "repo": "nixos-hardware", + "owner": "nix-systems", + "repo": "default", "type": "github" } }, @@ -686,21 +582,6 @@ "type": "github" } }, - "nixpkgs-24_11": { - "locked": { - "lastModified": 1734083684, - "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-24.11", - "type": "indirect" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1710695816, @@ -785,7 +666,10 @@ "ctucxWebsite": "ctucxWebsite", "dnsNix": "dnsNix", "firefoxGnomeTheme": "firefoxGnomeTheme", + "flakeCompat": "flakeCompat", + "flakeParts": "flakeParts", "flakeUtils": "flakeUtils", + "flakeyProfile": "flakeyProfile", "flauschehornSexy": "flauschehornSexy", "gpxMap": "gpxMap", "haumea": "haumea", @@ -797,7 +681,7 @@ "mqttWebUI": "mqttWebUI", "nixDarwin": "nixDarwin", "nixStd": "nixStd", - "nixosHardware": "nixosHardware", + "nixSystemsDefault": "nixSystemsDefault", "nixpkgs": "nixpkgs", "nixpkgsDarwin": "nixpkgsDarwin", "nixpkgsUnstable": "nixpkgsUnstable", @@ -835,11 +719,15 @@ "simpleNixosMailserver": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat_3", + "flake-compat": [ + "flakeCompat" + ], "nixpkgs": [ "nixpkgs" ], - "nixpkgs-24_11": "nixpkgs-24_11" + "nixpkgs-24_11": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1734884447, @@ -892,51 +780,6 @@ "url": "https://git.ctu.cx/stagit" } }, - "systems": { - "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, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "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" - } - }, "trainsearch": { "inputs": { "nixpkgs": [
diff --git a/flake.nix b/flake.nix @@ -154,44 +154,66 @@ }; inputs = { + + # these are just dependencies of other inputs + flakeCompat.url = "github:edolstra/flake-compat"; + flakeyProfile.url = "github:lf-/flakey-profile"; + flakeUtils.url = "github:numtide/flake-utils"; + flakeParts.url = "github:hercules-ci/flake-parts"; + nixSystemsDefault.url = "github:nix-systems/default"; + flakeUtils.inputs.systems.follows = "nixSystemsDefault"; + flakeParts.inputs.nixpkgs-lib.follows = "nixpkgs"; + + + # nixpkgs nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; nixpkgsDarwin.url = "github:NixOS/nixpkgs/nixpkgs-24.11-darwin"; nixpkgsUnstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - nixosHardware.url = "github:NixOS/nixos-hardware/master"; - nixDarwin.url = "github:lnl7/nix-darwin/nix-darwin-24.11"; nixDarwin.inputs.nixpkgs.follows = "nixpkgs"; homeManager.url = "github:nix-community/home-manager/release-24.11"; homeManager.inputs.nixpkgs.follows = "nixpkgs"; - impermanence.url = "github:nix-community/impermanence"; - agenix.url = "github:ryantm/agenix"; - agenix.inputs.nixpkgs.follows = "nixpkgs"; + agenix.inputs.nixpkgs.follows = "nixpkgs"; + agenix.inputs.darwin.follows = "nixDarwin"; + agenix.inputs.systems.follows = "nixSystemsDefault"; + agenix.inputs.home-manager.follows = "homeManager"; lanzaboote.url = "github:nix-community/lanzaboote/v0.4.1"; - lanzaboote.inputs.nixpkgs.follows = "nixpkgs"; + lanzaboote.inputs.nixpkgs.follows = "nixpkgs"; + lanzaboote.inputs.flake-parts.follows = "flakeParts"; + lanzaboote.inputs.flake-utils.follows = "flakeUtils"; + lanzaboote.inputs.flake-compat.follows = "flakeCompat"; simpleNixosMailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.11"; - simpleNixosMailserver.inputs.nixpkgs.follows = "nixpkgs"; + simpleNixosMailserver.inputs.nixpkgs.follows = "nixpkgs"; + simpleNixosMailserver.inputs.nixpkgs-24_11.follows = "nixpkgs"; + simpleNixosMailserver.inputs.flake-compat.follows = "flakeCompat"; lixModule.url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz"; - lixModule.inputs.flake-utils.follows = "flakeUtils"; - lixModule.inputs.nixpkgs.follows = "nixpkgs"; + lixModule.inputs.flake-utils.follows = "flakeUtils"; + lixModule.inputs.flakey-profile.follows = "flakeyProfile"; + lixModule.inputs.nixpkgs.follows = "nixpkgs"; + + + nixStd.url = "github:chessai/nix-std"; + impermanence.url = "github:nix-community/impermanence"; colmena.url = "github:zhaofengli/colmena"; colmena.inputs.nixpkgs.follows = "nixpkgs"; + colmena.inputs.flake-utils.follows = "flakeUtils"; + colmena.inputs.flake-compat.follows = "flakeCompat"; - haumea.url = "github:nix-community/haumea"; + haumea.url = "github:nix-community/haumea"; haumea.inputs.nixpkgs.follows = "nixpkgs"; - nixStd.url = "github:chessai/nix-std"; - flakeUtils.url = "github:numtide/flake-utils"; - dnsNix.url = "git+https://git.ctu.cx/dns.nix"; - dnsNix.inputs.nixpkgs.follows = "nixpkgs"; + dnsNix.inputs.nixpkgs.follows = "nixpkgs"; + dnsNix.inputs.flake-utils.follows = "flakeUtils"; + stagit.url = "git+https://git.ctu.cx/stagit"; stagit.inputs.nixpkgs.follows = "nixpkgs";