commit 21d8827e2713e2e58d42e45a6fab6a63b7ebc6ae
parent 513399f7ab593cac3f3a882a040fc0ab2f11cf28
Author: Katja (ctucx) <git@ctu.cx>
Date: Sun, 2 Mar 2025 15:01:14 +0100
parent 513399f7ab593cac3f3a882a040fc0ab2f11cf28
Author: Katja (ctucx) <git@ctu.cx>
Date: Sun, 2 Mar 2025 15:01:14 +0100
flake: format inputs
2 files changed, 70 insertions(+), 205 deletions(-)
diff --git a/flake.lock b/flake.lock @@ -19,7 +19,6 @@ }, "original": { "owner": "ryantm", - "ref": "main", "repo": "agenix", "type": "github" } @@ -60,7 +59,6 @@ }, "original": { "owner": "zhaofengli", - "ref": "main", "repo": "colmena", "type": "github" } @@ -98,14 +96,13 @@ "locked": { "lastModified": 1718089410, "narHash": "sha256-S9Zav9JqumWW618i+lWg11EIVYBP+oaGIK7HKek22Ac=", - "ref": "master", + "ref": "refs/heads/master", "rev": "36f20ee80e86e08a08c74ffa6a688b1e49473503", "revCount": 39, "type": "git", "url": "https://git.ctu.cx/gallery" }, "original": { - "ref": "master", "type": "git", "url": "https://git.ctu.cx/gallery" } @@ -122,14 +119,13 @@ "locked": { "lastModified": 1686768224, "narHash": "sha256-nf/b+YP9aWQ66EmAWUeI3xlAPijWgmo9X1A9vfRvxQg=", - "ref": "main", + "ref": "refs/heads/main", "rev": "7e5e220348e8ab834f4791472d4dc4f181c7c9e4", "revCount": 5, "type": "git", "url": "https://git.ctu.cx/ctucx.things" }, "original": { - "ref": "main", "type": "git", "url": "https://git.ctu.cx/ctucx.things" } @@ -146,14 +142,13 @@ "locked": { "lastModified": 1740300404, "narHash": "sha256-eFEz/okjK3O7O5qmbV7+VEknSrgp9njyNDta+0BEJkk=", - "ref": "main", + "ref": "refs/heads/main", "rev": "10ee03adae3de29e75dbcc31beb6b52ae68d4084", "revCount": 12, "type": "git", "url": "https://git.ctu.cx/website" }, "original": { - "ref": "main", "type": "git", "url": "https://git.ctu.cx/website" } @@ -187,16 +182,15 @@ ] }, "locked": { - "lastModified": 1740636552, - "narHash": "sha256-vBtVB8uU4Bxbyz43MhldAGX91i15j4LJI1Ss3mCCO7s=", + "lastModified": 1740755725, + "narHash": "sha256-amZbqP84H/ApugaT+TADXTB3NbjkVHI9Vac1saIk0kE=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "665cc04a60eb8ba47d41eadbe6264ca8a71943e8", + "rev": "5d6e0851b60508cffd66b4a6982440a40720338d", "type": "github" }, "original": { "owner": "lnl7", - "ref": "master", "repo": "nix-darwin", "type": "github" } @@ -211,14 +205,13 @@ "locked": { "lastModified": 1663056410, "narHash": "sha256-xzUD0euNuP0t7JzLCv8AB4oAwX1Aknvr2SBjp0O/iBY=", - "ref": "master", + "ref": "refs/heads/master", "rev": "1d6452f3c6fe65444a6115f49a5cf25724dee42d", "revCount": 73, "type": "git", "url": "https://git.ctu.cx/dns.nix" }, "original": { - "ref": "master", "type": "git", "url": "https://git.ctu.cx/dns.nix" } @@ -336,7 +329,6 @@ }, "original": { "owner": "numtide", - "ref": "main", "repo": "flake-utils", "type": "github" } @@ -386,14 +378,13 @@ "locked": { "lastModified": 1670689967, "narHash": "sha256-ncj009W3XYiWFdCeqib6uLfOKdG2OPvDQhz+vfarde8=", - "ref": "master", + "ref": "refs/heads/master", "rev": "6348176e7e144ce1bb442ef8c711a4ba7f60078f", "revCount": 4, "type": "git", "url": "https://git.ctu.cx/flauschehorn.sexy" }, "original": { - "ref": "master", "type": "git", "url": "https://git.ctu.cx/flauschehorn.sexy" } @@ -432,14 +423,13 @@ "locked": { "lastModified": 1701274753, "narHash": "sha256-kWMSBIhvX2A/GRrIxXnL1nAybCa7G2L8fjd2gI0dMik=", - "ref": "master", + "ref": "refs/heads/master", "rev": "35a87d4f2e28a48f7477b28447918fe95c361085", "revCount": 5, "type": "git", "url": "https://git.ctu.cx/gpx-map" }, "original": { - "ref": "master", "type": "git", "url": "https://git.ctu.cx/gpx-map" } @@ -497,7 +487,6 @@ }, "original": { "owner": "nix-community", - "ref": "master", "repo": "impermanence", "type": "github" } @@ -578,14 +567,13 @@ "locked": { "lastModified": 1685865116, "narHash": "sha256-i+LnfvnHLXNQaShm61PXMmqxe0ORzoPSaruwVzzK3RQ=", - "ref": "master", + "ref": "refs/heads/master", "rev": "30a69ef5132b8d53b68bde9149e8e8f43414745f", "revCount": 8, "type": "git", "url": "https://git.ctu.cx/mobile-coverage-map" }, "original": { - "ref": "master", "type": "git", "url": "https://git.ctu.cx/mobile-coverage-map" } @@ -602,14 +590,13 @@ "locked": { "lastModified": 1682967755, "narHash": "sha256-hY4TFn5CBdQ03fQS0y9/4FwtH6K4yBxTNKB+MMVI8VY=", - "ref": "master", + "ref": "refs/heads/master", "rev": "708d6abe88b66087007f339c601b54d8ba0a1fcd", "revCount": 19, "type": "git", "url": "https://git.ctu.cx/mqtt-webui" }, "original": { - "ref": "master", "type": "git", "url": "https://git.ctu.cx/mqtt-webui" } @@ -646,7 +633,6 @@ }, "original": { "owner": "chessai", - "ref": "master", "repo": "nix-std", "type": "github" } @@ -879,14 +865,13 @@ "locked": { "lastModified": 1691429917, "narHash": "sha256-qNXnbqCgPEnI4BOxs7RVrvgWrEqUMZ74Q9g/sE0A7zo=", - "ref": "main", + "ref": "refs/heads/main", "rev": "73899eba11a0e430cebd5b9a654c32f327eaceea", "revCount": 443, "type": "git", "url": "https://git.ctu.cx/stagit" }, "original": { - "ref": "main", "type": "git", "url": "https://git.ctu.cx/stagit" } @@ -948,14 +933,13 @@ "locked": { "lastModified": 1738751989, "narHash": "sha256-pi1iL4LEnD8xtZOTU9QVxVtL6S8/q/Tq28Yo+U/GENI=", - "ref": "main", + "ref": "refs/heads/main", "rev": "a609268e436b44109e78081692bf8cdc05ebaad1", "revCount": 225, "type": "git", "url": "https://git.ctu.cx/trainsearch" }, "original": { - "ref": "main", "type": "git", "url": "https://git.ctu.cx/trainsearch" } @@ -972,14 +956,13 @@ "locked": { "lastModified": 1719490179, "narHash": "sha256-2+8LHv8knMJFNU+rztgdJzw6rmzbFAtCIC39REBw2TQ=", - "ref": "main", + "ref": "refs/heads/main", "rev": "a93608c90c17c02ce08d9ded804de162df0e2372", "revCount": 8, "type": "git", "url": "https://git.ctu.cx/travelynx2fedi" }, "original": { - "ref": "main", "type": "git", "url": "https://git.ctu.cx/travelynx2fedi" }
diff --git a/flake.nix b/flake.nix @@ -70,215 +70,97 @@ inputs.colmena.overlay inputs.stagit.overlay + inputs.travelynx2fedi.overlay inputs.gpx-map.overlay inputs.mobile-coverage-map.overlay inputs.mqtt-webui.overlay - inputs.ctucx-things.overlay inputs.ctucx-gallery.overlay inputs.ctucx-website.overlay inputs.trainsearch.overlay - inputs.flauschehorn-sexy.overlay - inputs.travelynx2fedi.overlay ]; }; inputs = { - nixpkgs = { - type = "github"; - owner = "NixOS"; - repo = "nixpkgs"; - ref = "nixos-24.11"; - }; - - nixpkgsDarwin = { - type = "github"; - owner = "NixOS"; - repo = "nixpkgs"; - ref = "nixpkgs-24.11-darwin"; - }; - - nixpkgsUnstable = { - type = "github"; - owner = "NixOS"; - repo = "nixpkgs"; - ref = "nixpkgs-unstable"; - }; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; + nixpkgsDarwin.url = "github:NixOS/nixpkgs/nixpkgs-24.11-darwin"; + nixpkgsUnstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - nixos-hardware = { - type = "github"; - owner = "NixOS"; - repo = "nixos-hardware"; - ref = "master"; - }; - - lix-module = { - url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-2.tar.gz"; - inputs.flake-utils.follows = "flake-utils"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - home-manager = { - type = "github"; - owner = "nix-community"; - repo = "home-manager"; - ref = "release-24.11"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - darwin = { - type = "github"; - owner = "lnl7"; - repo = "nix-darwin"; - ref = "master"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - nix-std = { - type = "github"; - owner = "chessai"; - repo = "nix-std"; - ref = "master"; - }; + nixos-hardware.url = "github:NixOS/nixos-hardware/master"; - agenix = { - type = "github"; - owner = "ryantm"; - repo = "agenix"; - ref = "main"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + darwin.url = "github:lnl7/nix-darwin"; + darwin.inputs.nixpkgs.follows = "nixpkgs"; - colmena = { - type = "github"; - owner = "zhaofengli"; - repo = "colmena"; - ref = "main"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + home-manager.url = "github:nix-community/home-manager/release-24.11"; + home-manager.inputs.nixpkgs.follows = "nixpkgs"; - lanzaboote = { - type = "github"; - owner = "nix-community"; - repo = "lanzaboote"; - ref = "v0.4.1"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + impermanence.url = "github:nix-community/impermanence"; - simple-nixos-mailserver = { - type = "gitlab"; - owner = "simple-nixos-mailserver"; - repo = "nixos-mailserver"; - ref = "nixos-24.11"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + agenix.url = "github:ryantm/agenix"; + agenix.inputs.nixpkgs.follows = "nixpkgs"; - flake-utils = { - type = "github"; - owner = "numtide"; - repo = "flake-utils"; - ref = "main"; - }; + lanzaboote.url = "github:nix-community/lanzaboote/v0.4.1"; + lanzaboote.inputs.nixpkgs.follows = "nixpkgs"; - impermanence = { - type = "github"; - owner = "nix-community"; - repo = "impermanence"; - ref = "master"; - }; + simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.11"; + simple-nixos-mailserver.inputs.nixpkgs.follows = "nixpkgs"; + lix-module.url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-2.tar.gz"; + lix-module.inputs.flake-utils.follows = "flake-utils"; + lix-module.inputs.nixpkgs.follows = "nixpkgs"; - dns-nix = { - type = "git"; - url = "https://git.ctu.cx/dns.nix"; - ref = "master"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + colmena.url = "github:zhaofengli/colmena"; + colmena.inputs.nixpkgs.follows = "nixpkgs"; - stagit = { - type = "git"; - url = "https://git.ctu.cx/stagit"; - ref = "main"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flake-utils"; - }; + nix-std.url = "github:chessai/nix-std"; + flake-utils.url = "github:numtide/flake-utils"; - mqtt-webui = { - type = "git"; - url = "https://git.ctu.cx/mqtt-webui"; - ref = "master"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flake-utils"; - }; + dns-nix.url = "git+https://git.ctu.cx/dns.nix"; + dns-nix.inputs.nixpkgs.follows = "nixpkgs"; - trainsearch = { - type = "git"; - url = "https://git.ctu.cx/trainsearch"; - ref = "main"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flake-utils"; - }; + stagit.url = "git+https://git.ctu.cx/stagit"; + stagit.inputs.nixpkgs.follows = "nixpkgs"; + stagit.inputs.flake-utils.follows = "flake-utils"; - ctucx-website = { - type = "git"; - url = "https://git.ctu.cx/website"; - ref = "main"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flake-utils"; - }; + mqtt-webui.url = "git+https://git.ctu.cx/mqtt-webui"; + mqtt-webui.inputs.nixpkgs.follows = "nixpkgs"; + mqtt-webui.inputs.flake-utils.follows = "flake-utils"; - ctucx-things = { - type = "git"; - url = "https://git.ctu.cx/ctucx.things"; - ref = "main"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flake-utils"; - }; + trainsearch.url = "git+https://git.ctu.cx/trainsearch"; + trainsearch.inputs.nixpkgs.follows = "nixpkgs"; + trainsearch.inputs.flake-utils.follows = "flake-utils"; + + ctucx-website.url = "git+https://git.ctu.cx/website"; + ctucx-website.inputs.nixpkgs.follows = "nixpkgs"; + ctucx-website.inputs.flake-utils.follows = "flake-utils"; - ctucx-gallery = { - type = "git"; - url = "https://git.ctu.cx/gallery"; - ref = "master"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flake-utils"; - }; + ctucx-things.url = "git+https://git.ctu.cx/ctucx.things"; + ctucx-things.inputs.nixpkgs.follows = "nixpkgs"; + ctucx-things.inputs.flake-utils.follows = "flake-utils"; - flauschehorn-sexy = { - type = "git"; - url = "https://git.ctu.cx/flauschehorn.sexy"; - ref = "master"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flake-utils"; - }; + ctucx-gallery.url = "git+https://git.ctu.cx/gallery"; + ctucx-gallery.inputs.nixpkgs.follows = "nixpkgs"; + ctucx-gallery.inputs.flake-utils.follows = "flake-utils"; - mobile-coverage-map = { - type = "git"; - url = "https://git.ctu.cx/mobile-coverage-map"; - ref = "master"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flake-utils"; - }; + flauschehorn-sexy.url = "git+https://git.ctu.cx/flauschehorn.sexy"; + flauschehorn-sexy.inputs.nixpkgs.follows = "nixpkgs"; + flauschehorn-sexy.inputs.flake-utils.follows = "flake-utils"; - gpx-map = { - type = "git"; - url = "https://git.ctu.cx/gpx-map"; - ref = "master"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flake-utils"; - }; + mobile-coverage-map.url = "git+https://git.ctu.cx/mobile-coverage-map"; + mobile-coverage-map.inputs.nixpkgs.follows = "nixpkgs"; + mobile-coverage-map.inputs.flake-utils.follows = "flake-utils"; - travelynx2fedi = { - type = "git"; - url = "https://git.ctu.cx/travelynx2fedi"; - ref = "main"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flake-utils"; - }; + gpx-map.url = "git+https://git.ctu.cx/gpx-map"; + gpx-map.inputs.nixpkgs.follows = "nixpkgs"; + gpx-map.inputs.flake-utils.follows = "flake-utils"; + travelynx2fedi.url = "git+https://git.ctu.cx/travelynx2fedi"; + travelynx2fedi.inputs.nixpkgs.follows = "nixpkgs"; + travelynx2fedi.inputs.flake-utils.follows = "flake-utils"; }; }