diff --git a/README.md b/README.md index 6851700..05f116e 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ Start from `flake.nix` (see [Flakes](https://nixos.wiki/wiki/Flakes)). [`flake-p sudo nixos-rebuild boot ``` - To autoformat the project tree using nixpkgs-fmt, run `nix fmt`. -- To build all flake outputs (locally or in CI), run `nix --accept-flake-config run github:srid/nixci build` +- To build all flake outputs (locally or in CI), run `nix --accept-flake-config run github:juspay/omnix ci build` - For secrets management, I use [ragenix](https://github.com/yaxitech/ragenix). ## Discussion diff --git a/flake.lock b/flake.lock index 36570fb..78db5e2 100644 --- a/flake.lock +++ b/flake.lock @@ -32,7 +32,7 @@ "ragenix", "nixpkgs" ], - "systems": "systems_10" + "systems": "systems_7" }, "locked": { "lastModified": 1707830867, @@ -64,21 +64,6 @@ } }, "cargo-doc-live_2": { - "locked": { - "lastModified": 1692743000, - "narHash": "sha256-7lxG/r72hECceIir+Y+N3vM0f7FcudZD5cq+KhZj4MI=", - "owner": "srid", - "repo": "cargo-doc-live", - "rev": "575b9d0733cac0448219d7bc5746ebd594baedb5", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "cargo-doc-live", - "type": "github" - } - }, - "cargo-doc-live_3": { "locked": { "lastModified": 1717704203, "narHash": "sha256-U6r0Af8/JGiV+gzQGEjLLc34sT6MZllUUrRe0NbUiAA=", @@ -117,29 +102,6 @@ } }, "crane_2": { - "inputs": { - "nixpkgs": [ - "nixci", - "rust-flake", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1707685877, - "narHash": "sha256-XoXRS+5whotelr1rHiZle5t5hDg9kpguS5yk8c8qzOc=", - "owner": "ipetkov", - "repo": "crane", - "rev": "2c653e4478476a52c6aa3ac0495e4dea7449ea0e", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "rev": "2c653e4478476a52c6aa3ac0495e4dea7449ea0e", - "type": "github" - } - }, - "crane_3": { "inputs": { "nixpkgs": [ "omnix", @@ -161,7 +123,7 @@ "type": "github" } }, - "crane_4": { + "crane_3": { "inputs": { "nixpkgs": [ "ragenix", @@ -223,7 +185,7 @@ }, "devshell": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixvim", "nixpkgs" @@ -264,22 +226,6 @@ } }, "flake-compat": { - "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_2": { "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", @@ -293,7 +239,7 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, - "flake-compat_3": { + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1696426674, @@ -346,24 +292,6 @@ } }, "flake-parts_3": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_3" - }, - "locked": { - "lastModified": 1688466019, - "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "nixvim", @@ -384,9 +312,9 @@ "type": "github" } }, - "flake-parts_5": { + "flake-parts_4": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_4" + "nixpkgs-lib": "nixpkgs-lib_3" }, "locked": { "lastModified": 1719994518, @@ -425,11 +353,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -442,42 +370,6 @@ "inputs": { "systems": "systems_4" }, - "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "inputs": { - "systems": "systems_6" - }, - "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_5": { - "inputs": { - "systems": "systems_7" - }, "locked": { "lastModified": 1701680307, "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", @@ -492,7 +384,25 @@ "type": "github" } }, - "flake-utils_6": { + "flake-utils_4": { + "inputs": { + "systems": "systems_5" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_5": { "inputs": { "systems": "systems_8" }, @@ -510,28 +420,10 @@ "type": "github" } }, - "flake-utils_7": { - "inputs": { - "systems": "systems_11" - }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "git-hooks": { "inputs": { - "flake-compat": "flake-compat_3", - "gitignore": "gitignore_2", + "flake-compat": "flake-compat_2", + "gitignore": "gitignore", "nixpkgs": [ "nixvim", "nixpkgs" @@ -571,28 +463,6 @@ } }, "gitignore": { - "inputs": { - "nixpkgs": [ - "nixci", - "pre-commit-hooks-nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_2": { "inputs": { "nixpkgs": [ "nixvim", @@ -677,21 +547,6 @@ "type": "github" } }, - "just-flake": { - "locked": { - "lastModified": 1713316411, - "narHash": "sha256-NkJfU6H+6vgHkPtZ2ESbZ/h2wnsDQrZvB4vbdUIBx8Q=", - "owner": "juspay", - "repo": "just-flake", - "rev": "0e33952a4bcd16cd54ee3aba8111606c237d4526", - "type": "github" - }, - "original": { - "owner": "juspay", - "repo": "just-flake", - "type": "github" - } - }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -753,33 +608,6 @@ "type": "github" } }, - "nixci": { - "inputs": { - "cargo-doc-live": "cargo-doc-live_2", - "devour-flake": "devour-flake", - "flake-parts": "flake-parts_3", - "just-flake": "just-flake", - "nixpkgs": "nixpkgs_3", - "pre-commit-hooks-nix": "pre-commit-hooks-nix", - "process-compose-flake": "process-compose-flake_2", - "rust-flake": "rust-flake_2", - "systems": "systems_5", - "treefmt-nix": "treefmt-nix_2" - }, - "locked": { - "lastModified": 1721750549, - "narHash": "sha256-ZJteCUj5TjgLZaP4YQGlmeLlkeZO4h6Ujskg36o+NRw=", - "owner": "srid", - "repo": "nixci", - "rev": "1b2caf369c739382e2f1c22bfb32096f65addfba", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "nixci", - "type": "github" - } - }, "nixos-flake": { "locked": { "lastModified": 1720281493, @@ -812,8 +640,8 @@ }, "nixos-vscode-server": { "inputs": { - "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_6" + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1684517665, @@ -870,24 +698,6 @@ } }, "nixpkgs-lib_3": { - "locked": { - "dir": "lib", - "lastModified": 1688049487, - "narHash": "sha256-100g4iaKC9MalDjUW9iN6Jl/OocTDtXdeAj7pEGIRh4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4bc72cae107788bf3f24f30db2e2f685c9298dc9", - "type": "github" - }, - "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-lib_4": { "locked": { "lastModified": 1719876945, "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=", @@ -899,22 +709,6 @@ "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" } }, - "nixpkgs_10": { - "locked": { - "lastModified": 1680945546, - "narHash": "sha256-8FuaH5t/aVi/pR1XxnF0qi4WwMYC+YxlfdsA0V+TEuQ=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "d9f759f2ea8d265d974a6e1259bd510ac5844c5d", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1706487304, @@ -932,54 +726,6 @@ } }, "nixpkgs_3": { - "locked": { - "lastModified": 1714763106, - "narHash": "sha256-DrDHo74uTycfpAF+/qxZAMlP/Cpe04BVioJb6fdI0YY=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "e9be42459999a253a9f92559b1f5b72e1b44c13d", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1681358109, - "narHash": "sha256-eKyxW4OohHQx9Urxi7TQlFBTDWII+F+x2hklDOQPB50=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "96ba1c52e54e74c3197f4d43026b3f3d92e83ff9", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1680945546, - "narHash": "sha256-8FuaH5t/aVi/pR1XxnF0qi4WwMYC+YxlfdsA0V+TEuQ=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "d9f759f2ea8d265d974a6e1259bd510ac5844c5d", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { "locked": { "lastModified": 1682526928, "narHash": "sha256-2cKh4O6t1rQ8Ok+v16URynmb0rV7oZPEbXkU0owNLQs=", @@ -992,7 +738,7 @@ "type": "indirect" } }, - "nixpkgs_7": { + "nixpkgs_4": { "locked": { "lastModified": 1720031269, "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", @@ -1008,7 +754,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_5": { "locked": { "lastModified": 1720087678, "narHash": "sha256-uOhYJU3ldDKXYV+mFaXcPtyjq/UIMh/6SCuoVNU9rxM=", @@ -1024,7 +770,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_6": { "locked": { "lastModified": 1708655239, "narHash": "sha256-ZrP/yACUvDB+zbqYJsln4iwotbH6CTZiTkANJ0AgDv4=", @@ -1040,18 +786,34 @@ "type": "github" } }, + "nixpkgs_7": { + "locked": { + "lastModified": 1680945546, + "narHash": "sha256-8FuaH5t/aVi/pR1XxnF0qi4WwMYC+YxlfdsA0V+TEuQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d9f759f2ea8d265d974a6e1259bd510ac5844c5d", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "devshell": "devshell", - "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts_4", + "flake-compat": "flake-compat", + "flake-parts": "flake-parts_3", "git-hooks": "git-hooks", "home-manager": "home-manager_2", "nix-darwin": "nix-darwin_2", "nixpkgs": [ "nixpkgs" ], - "treefmt-nix": "treefmt-nix_3" + "treefmt-nix": "treefmt-nix_2" }, "locked": { "lastModified": 1718734874, @@ -1069,20 +831,21 @@ }, "omnix": { "inputs": { - "cargo-doc-live": "cargo-doc-live_3", - "flake-parts": "flake-parts_5", - "nixpkgs": "nixpkgs_8", - "process-compose-flake": "process-compose-flake_3", - "rust-flake": "rust-flake_3", - "systems": "systems_9", - "treefmt-nix": "treefmt-nix_4" + "cargo-doc-live": "cargo-doc-live_2", + "devour-flake": "devour-flake", + "flake-parts": "flake-parts_4", + "nixpkgs": "nixpkgs_5", + "process-compose-flake": "process-compose-flake_2", + "rust-flake": "rust-flake_2", + "systems": "systems_6", + "treefmt-nix": "treefmt-nix_3" }, "locked": { - "lastModified": 1721856334, - "narHash": "sha256-TXv+td0KVgAaRol4c0t7OT5fDfQV4/kNhAUG5KI+Aeg=", + "lastModified": 1722016826, + "narHash": "sha256-M8idsLs1sMq5aqLDj/RXq9dybw0A+zIrowvMZ0GBk9U=", "owner": "juspay", "repo": "omnix", - "rev": "4596ac37af5c0c04e8356e912cc90f66553fd276", + "rev": "f1223f887478d3f5cabf3a4ab08f2f92e91f4552", "type": "github" }, "original": { @@ -1091,34 +854,6 @@ "type": "github" } }, - "pre-commit-hooks-nix": { - "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils_2", - "gitignore": "gitignore", - "nixpkgs": [ - "nixci", - "nixpkgs" - ], - "nixpkgs-stable": [ - "nixci", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1714478972, - "narHash": "sha256-q//cgb52vv81uOuwz1LaXElp3XAe1TqrABXODAEF6Sk=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "2849da033884f54822af194400f8dff435ada242", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "process-compose-flake": { "locked": { "lastModified": 1718031437, @@ -1135,21 +870,6 @@ } }, "process-compose-flake_2": { - "locked": { - "lastModified": 1693927910, - "narHash": "sha256-qPKHnWWzHS2bAi/SsFePQkGFeC2E1jklUjEidfQwYLc=", - "owner": "Platonic-Systems", - "repo": "process-compose-flake", - "rev": "5494afa0b6a7bc4ccf82ef1c36fe1fcdb4217255", - "type": "github" - }, - "original": { - "owner": "Platonic-Systems", - "repo": "process-compose-flake", - "type": "github" - } - }, - "process-compose-flake_3": { "locked": { "lastModified": 1718031437, "narHash": "sha256-+RrlkAVZx0QhyeHAGFJnjST+/7Dc3zsDU3zAKXoDXaI=", @@ -1167,10 +887,10 @@ "ragenix": { "inputs": { "agenix": "agenix", - "crane": "crane_4", - "flake-utils": "flake-utils_7", - "nixpkgs": "nixpkgs_9", - "rust-overlay": "rust-overlay_4" + "crane": "crane_3", + "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_6", + "rust-overlay": "rust-overlay_3" }, "locked": { "lastModified": 1718869541, @@ -1195,15 +915,14 @@ "home-manager": "home-manager", "nix-darwin": "nix-darwin", "nix-index-database": "nix-index-database", - "nixci": "nixci", "nixos-flake": "nixos-flake", "nixos-hardware": "nixos-hardware", "nixos-vscode-server": "nixos-vscode-server", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_4", "nixvim": "nixvim", "omnix": "omnix", "ragenix": "ragenix", - "treefmt-nix": "treefmt-nix_5" + "treefmt-nix": "treefmt-nix_4" } }, "rust-flake": { @@ -1233,34 +952,11 @@ "rust-flake_2": { "inputs": { "crane": "crane_2", - "nixpkgs": [ - "nixci", - "nixpkgs" - ], - "rust-overlay": "rust-overlay_2" - }, - "locked": { - "lastModified": 1713345390, - "narHash": "sha256-JukrAWf4u9ECX6XEDcFpQaTGuqjvKl1ecuOOdrstEH4=", - "owner": "juspay", - "repo": "rust-flake", - "rev": "b2535a09c5ed6c33904a59bd4a965aaf14fbddc3", - "type": "github" - }, - "original": { - "owner": "juspay", - "repo": "rust-flake", - "type": "github" - } - }, - "rust-flake_3": { - "inputs": { - "crane": "crane_3", "nixpkgs": [ "omnix", "nixpkgs" ], - "rust-overlay": "rust-overlay_3" + "rust-overlay": "rust-overlay_2" }, "locked": { "lastModified": 1721249094, @@ -1297,26 +993,7 @@ }, "rust-overlay_2": { "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_4" - }, - "locked": { - "lastModified": 1701310566, - "narHash": "sha256-CL9J3xUR2Ejni4LysrEGX0IdO+Y4BXCiH/By0lmF3eQ=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "6d3c6e185198b8bf7ad639f22404a75aa9a09bff", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_3": { - "inputs": { - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_4", "nixpkgs": [ "omnix", "rust-flake", @@ -1337,7 +1014,7 @@ "type": "github" } }, - "rust-overlay_4": { + "rust-overlay_3": { "inputs": { "flake-utils": [ "ragenix", @@ -1377,36 +1054,6 @@ "type": "github" } }, - "systems_10": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_11": { - "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, @@ -1512,21 +1159,6 @@ "type": "github" } }, - "systems_9": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1549,24 +1181,6 @@ } }, "treefmt-nix_2": { - "inputs": { - "nixpkgs": "nixpkgs_5" - }, - "locked": { - "lastModified": 1688026376, - "narHash": "sha256-qJmkr9BWDpqblk4E9/rCsAEl39y2n4Ycw6KRopvpUcY=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "df3f32b0cc253dfc7009b7317e8f0e7ccd70b1cf", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "treefmt-nix_3": { "inputs": { "nixpkgs": [ "nixvim", @@ -1587,7 +1201,7 @@ "type": "github" } }, - "treefmt-nix_4": { + "treefmt-nix_3": { "inputs": { "nixpkgs": [ "omnix", @@ -1608,9 +1222,9 @@ "type": "github" } }, - "treefmt-nix_5": { + "treefmt-nix_4": { "inputs": { - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1689243103, diff --git a/flake.nix b/flake.nix index a842d94..8404e34 100644 --- a/flake.nix +++ b/flake.nix @@ -19,7 +19,6 @@ github-nix-ci.url = "github:juspay/github-nix-ci"; nixos-vscode-server.flake = false; nixos-vscode-server.url = "github:nix-community/nixos-vscode-server"; - nixci.url = "github:srid/nixci"; nix-index-database.url = "github:nix-community/nix-index-database"; nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; actualism-app.url = "github:srid/actualism-app"; diff --git a/home/terminal.nix b/home/terminal.nix index 51436b6..3212064 100644 --- a/home/terminal.nix +++ b/home/terminal.nix @@ -12,8 +12,7 @@ # ncdu # Useful for Nix development - nixci - nixci-build-remote + om-ci-build-remote ci omnix nixpkgs-fmt diff --git a/packages/ci/default.nix b/packages/ci/default.nix index d458663..04656eb 100644 --- a/packages/ci/default.nix +++ b/packages/ci/default.nix @@ -1,12 +1,12 @@ -{ writeShellApplication, nixci-build-remote, zellij, ... }: +{ writeShellApplication, om-ci-build-remote, zellij, ... }: writeShellApplication { name = "ci"; - runtimeInputs = [ nixci-build-remote zellij ]; + runtimeInputs = [ om-ci-build-remote zellij ]; meta.description = '' Run CI locally. - Powered by nixci, zellij and your beefy machines over SSH. + Powered by omnix, zellij and your beefy machines over SSH. ''; text = '' PRJ=$(basename "$(pwd)") diff --git a/packages/ci/layout.kdl b/packages/ci/layout.kdl index 69ae191..e9a429d 100644 --- a/packages/ci/layout.kdl +++ b/packages/ci/layout.kdl @@ -1,6 +1,6 @@ // TODO: Make it a nix module? cf. https://github.com/nix-community/home-manager/issues/4485 // - Don't't hardcode hostnames/ systems -// - Use nix store path for nixci-build-remote +// - Use nix store path for om-ci-build-remote layout { pane size=1 borderless=true { plugin location="tab-bar" @@ -8,12 +8,12 @@ layout { pane split_direction="horizontal" { pane { name "x86_64-linux" - command "nixci-build-remote" + command "om-ci-build-remote" args "nix-infra@dosa" } pane { name "aaarch64-darwin" - command "nixci-build-remote" + command "om-ci-build-remote" args "nix-infra@sambar" } } diff --git a/packages/nixci-build-remote.nix b/packages/om-ci-build-remote.nix similarity index 73% rename from packages/nixci-build-remote.nix rename to packages/om-ci-build-remote.nix index 8f9ac54..47dfbb5 100644 --- a/packages/nixci-build-remote.nix +++ b/packages/om-ci-build-remote.nix @@ -2,7 +2,7 @@ { writeShellApplication, jq, nix, ... }: writeShellApplication { - name = "nixci-build-remote"; + name = "om-ci-build-remote"; runtimeInputs = [ jq nix ]; meta.description = '' `nixci build`, but build remotely over SSH. @@ -12,8 +12,8 @@ writeShellApplication { FLAKE=$(nix flake metadata --json | jq -r .path) set -x nix copy --to "ssh://$1" "$FLAKE" - nix copy --to "ssh://$1" ${inputs.nixci} + nix copy --to "ssh://$1" ${inputs.omnix} # shellcheck disable=SC2029 - ssh "$1" nix run ${inputs.nixci}#default build "$FLAKE" + ssh "$1" nix run ${inputs.omnix}#default ci build "$FLAKE" ''; } diff --git a/packages/overlay.nix b/packages/overlay.nix index fa3fdf5..f3b5224 100644 --- a/packages/overlay.nix +++ b/packages/overlay.nix @@ -4,9 +4,8 @@ self: super: { fuckport = self.callPackage ./fuckport.nix { }; twitter-convert = self.callPackage ./twitter-convert { }; sshuttle-via = self.callPackage ./sshuttle-via.nix { }; - nixci-build-remote = self.callPackage (import ./nixci-build-remote.nix { inherit (flake) inputs; }) { }; + om-ci-build-remote = self.callPackage (import ./om-ci-build-remote.nix { inherit (flake) inputs; }) { }; ci = self.callPackage ./ci { }; - nixci = flake.inputs.nixci.packages.${system}.default; # nix-health = flake.inputs.nix-browser.packages.${system}.nix-health; actualism-app = flake.inputs.actualism-app.packages.${system}.default; omnix = flake.inputs.omnix.packages.${system}.default;