From f5a9208c6883a42b14ddac7dc77508056d7f6f4c Mon Sep 17 00:00:00 2001 From: guangtao Date: Sun, 25 Feb 2024 00:16:34 -0800 Subject: [PATCH] chore: update --- .github/workflows/checks.yaml | 2 +- .github/workflows/update.yml | 4 +- flake.lock | 24 +- local/cells/repo/devshells.nix | 6 +- local/cells/repo/nixago.nix | 24 + local/cells/repo/pops.nix | 16 + local/flake.lock | 872 ++------------------------------- local/flake.nix | 25 +- 8 files changed, 116 insertions(+), 857 deletions(-) create mode 100644 local/cells/repo/nixago.nix create mode 100644 local/cells/repo/pops.nix diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml index 70bb4db..8e8c602 100644 --- a/.github/workflows/checks.yaml +++ b/.github/workflows/checks.yaml @@ -3,7 +3,7 @@ on: pull_request: push: branches: - - master + - main jobs: nix: runs-on: ubuntu-latest diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 19b5340..bec3652 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -6,7 +6,7 @@ on: jobs: lockfile: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@v3 @@ -14,7 +14,5 @@ jobs: uses: DeterminateSystems/nix-installer-action@main - name: Enable magic Nix cache uses: DeterminateSystems/magic-nix-cache-action@main - - name: Check flake - uses: DeterminateSystems/flake-checker-action@main - name: Update flake.lock uses: DeterminateSystems/update-flake-lock@main diff --git a/flake.lock b/flake.lock index f5fd8b3..3b17505 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ }, "call-flake": { "locked": { - "lastModified": 1697332845, - "narHash": "sha256-bmhE1TmrJG4ba93l9WQTLuYM53kwGQAjYHRvHOeuxWU=", + "lastModified": 1708823923, + "narHash": "sha256-YWQxR+4b4uQGMXOV+gX7fhhi0MiGyTfTdtBl6IsL8z8=", "owner": "divnix", "repo": "call-flake", - "rev": "088f8589c7f3ee59bea1858a89f5125d284c3c4a", + "rev": "8549423909884eec852c72136eb5b89e9c2f3596", "type": "github" }, "original": { @@ -50,11 +50,11 @@ ] }, "locked": { - "lastModified": 1686862774, - "narHash": "sha256-ojGtRQ9pIOUrxsQEuEPerUkqIJEuod9hIflfNkY+9CE=", + "lastModified": 1698340621, + "narHash": "sha256-SFrpyBVYaBVu4kaEm6O9O5P+ZKASMEa2EOQSlC33/Ok=", "owner": "divnix", "repo": "dmerge", - "rev": "9f7f7a8349d33d7bd02e0f2b484b1f076e503a96", + "rev": "7e528814b0da207ea12ab3f62f2a928b7b8fe9c6", "type": "github" }, "original": { @@ -70,11 +70,11 @@ ] }, "locked": { - "lastModified": 1697205539, - "narHash": "sha256-gHEy0Q+eEQJkWl6/DpFxXPOlTx/lMU7Pvs/bwoq4OhI=", + "lastModified": 1708375098, + "narHash": "sha256-DaFJp3wDHgOqx98U0SF57bXaH2Orp106c+jSdPCVu1E=", "owner": "nix-community", "repo": "haumea", - "rev": "fc119c500189f739fec7ad33d111f9c92910eccf", + "rev": "ec6350fd9353e7f27ce0e85d31f82e3ed73e4d70", "type": "github" }, "original": { @@ -85,11 +85,11 @@ }, "nixlib": { "locked": { - "lastModified": 1705193289, - "narHash": "sha256-oL5EAaZHiA3ABLdyKag/DgT+457vmELv8A+eaox2xsI=", + "lastModified": 1708821942, + "narHash": "sha256-jd+E1SD59qty65pwqad2mftzkT6vW5nNFWVuvayh4Zw=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "da839f74dc77c9826fa333b1bc2c8258fd6ffcbe", + "rev": "479831ed8b3c9c7b80533999f880c7d0bf6a491b", "type": "github" }, "original": { diff --git a/local/cells/repo/devshells.nix b/local/cells/repo/devshells.nix index 815445e..1924dc1 100755 --- a/local/cells/repo/devshells.nix +++ b/local/cells/repo/devshells.nix @@ -15,9 +15,9 @@ in # This is Standard's devshell integration. # It runs the startup hook when entering the shell. nixago = [ - (inputs.std-ext.presets.nixago.conform cell.configs.conform) - (inputs.std-ext.presets.nixago.treefmt) - (inputs.std-ext.presets.nixago.lefthook) + cell.nixago.treefmt.default + cell.nixago.lefthook.default + cell.nixago.conform.default ]; commands = [ ]; diff --git a/local/cells/repo/nixago.nix b/local/cells/repo/nixago.nix new file mode 100644 index 0000000..8df3bd0 --- /dev/null +++ b/local/cells/repo/nixago.nix @@ -0,0 +1,24 @@ +{ inputs, cell }: +with inputs.std.inputs.dmerge; +let + cfg = { + inherit (cell.pops.configs.exports.default) treefmt lefthook conform; + }; + inherit (cell.pops.configs.exports.stdNixago) treefmt lefthook conform; +in +{ + lefthook = { + inherit (lefthook) default; + }; + treefmt = { + default = (treefmt.default cfg.treefmt.nickel); + }; + conform = rec { + default = conform.default custom; + custom = { + data = { + commit.conventional.scopes = append [ ".*." ]; + }; + }; + }; +} diff --git a/local/cells/repo/pops.nix b/local/cells/repo/pops.nix new file mode 100644 index 0000000..57ba4c4 --- /dev/null +++ b/local/cells/repo/pops.nix @@ -0,0 +1,16 @@ +{ inputs, cell }: +let + inherit (inputs) nixpkgs omnibus; + inputs' = (inputs.omnibus.pops.flake.setSystem nixpkgs.system).inputs; +in +{ + configs = inputs.omnibus.pops.configs { + inputs = { + inputs = { + inherit (inputs') nixfmt pre-commit-hooks; + inherit (inputs) std; + inherit nixpkgs; + }; + }; + }; +} diff --git a/local/flake.lock b/local/flake.lock index 1b93a7c..055dfbe 100755 --- a/local/flake.lock +++ b/local/flake.lock @@ -2,10 +2,17 @@ "nodes": { "POP": { "inputs": { - "flake-compat": "flake-compat", - "nixlib": "nixlib", + "flake-compat": [ + "omnibus", + "flops" + ], + "nixlib": [ + "omnibus", + "flops", + "nixlib" + ], "nixpkgs": [ - "std-ext", + "omnibus", "flops" ] }, @@ -23,28 +30,13 @@ "type": "github" } }, - "blank": { - "locked": { - "lastModified": 1625557891, - "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=", - "owner": "divnix", - "repo": "blank", - "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "blank", - "type": "github" - } - }, "call-flake": { "locked": { - "lastModified": 1691284812, - "narHash": "sha256-bmhE1TmrJG4ba93l9WQTLuYM53kwGQAjYHRvHOeuxWU=", + "lastModified": 1708823923, + "narHash": "sha256-YWQxR+4b4uQGMXOV+gX7fhhi0MiGyTfTdtBl6IsL8z8=", "owner": "divnix", "repo": "call-flake", - "rev": "0510cb1562720ae66cb5010c56b856142b837a3f", + "rev": "8549423909884eec852c72136eb5b89e9c2f3596", "type": "github" }, "original": { @@ -55,11 +47,11 @@ }, "call-flake_2": { "locked": { - "lastModified": 1689473344, + "lastModified": 1697332845, "narHash": "sha256-bmhE1TmrJG4ba93l9WQTLuYM53kwGQAjYHRvHOeuxWU=", "owner": "divnix", "repo": "call-flake", - "rev": "a07e91d3fb59eb9f7ec706a151e1a7b36a1e8727", + "rev": "088f8589c7f3ee59bea1858a89f5125d284c3c4a", "type": "github" }, "original": { @@ -68,70 +60,20 @@ "type": "github" } }, - "call-flake_3": { - "locked": { - "lastModified": 1687380775, - "narHash": "sha256-bmhE1TmrJG4ba93l9WQTLuYM53kwGQAjYHRvHOeuxWU=", - "owner": "divnix", - "repo": "call-flake", - "rev": "74061f6c241227cd05e79b702db9a300a2e4131a", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "call-flake", - "type": "github" - } - }, - "cortex": { - "flake": false, - "locked": { - "lastModified": 1643528409, - "narHash": "sha256-ldmenmCzCEuuBlMtaQYe79vYbcTORgkCXgYgGkOzkL8=", - "owner": "jethrokuan", - "repo": "cortex", - "rev": "ad9a963534e5be323a33eaf0f9aa3e914cca8093", - "type": "github" - }, - "original": { - "owner": "jethrokuan", - "repo": "cortex", - "type": "github" - } - }, - "devshell": { - "inputs": { - "nixpkgs": "nixpkgs", - "systems": "systems" - }, - "locked": { - "lastModified": 1692793255, - "narHash": "sha256-yVyj0AE280JkccDHuG1XO9oGxN6bW8ksr/xttXcXzK0=", - "owner": "numtide", - "repo": "devshell", - "rev": "2aa26972b951bc05c3632d4e5ae683cb6771a7c6", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, "dmerge": { "inputs": { "haumea": [ - "std-ext", + "omnibus", "flops", "haumea" ], "nixlib": [ - "std-ext", + "omnibus", "flops", "nixlib" ], "yants": [ - "std-ext", + "omnibus", "flops", "yants" ] @@ -150,201 +92,21 @@ "type": "github" } }, - "dmerge_2": { - "inputs": { - "haumea": [ - "std-ext", - "std", - "haumea" - ], - "nixlib": [ - "std-ext", - "std", - "lib" - ], - "yants": [ - "std-ext", - "std", - "yants" - ] - }, - "locked": { - "lastModified": 1686862774, - "narHash": "sha256-ojGtRQ9pIOUrxsQEuEPerUkqIJEuod9hIflfNkY+9CE=", - "owner": "divnix", - "repo": "dmerge", - "rev": "9f7f7a8349d33d7bd02e0f2b484b1f076e503a96", - "type": "github" - }, - "original": { - "owner": "divnix", - "ref": "0.2.1", - "repo": "dmerge", - "type": "github" - } - }, - "emacs-overlay": { - "inputs": { - "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_4", - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1690483432, - "narHash": "sha256-o4/IGadFvyT68byD+NglNK+zykMMjglXdsCSL63OJLc=", - "owner": "nix-community", - "repo": "emacs-overlay", - "rev": "01c076bb6f9fd34630f4c87cfab18ea4e85ef819", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "emacs-overlay", - "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-utils": { - "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_5": { - "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_6": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_7": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "flops": { "inputs": { "POP": "POP", "call-flake": "call-flake_2", "dmerge": "dmerge", "haumea": "haumea", - "nixlib": "nixlib_2", + "nixlib": "nixlib", "yants": "yants" }, "locked": { - "lastModified": 1694677528, - "narHash": "sha256-j29810CVcDZGPkm1EeBn0hfeOt2kfpLYhXrDjI02eL0=", + "lastModified": 1705217630, + "narHash": "sha256-3NBtDY1euNkQFkDGvLXZFgoeRhYnALktzbSLDeCUcDY=", "owner": "gtrunsec", "repo": "flops", - "rev": "1004a97ea0c3960d162d2b13e862b347191e3ba9", + "rev": "9a97f5d108f2f5a6d461e4d00e86b1e7c0a9973a", "type": "github" }, "original": { @@ -356,228 +118,32 @@ "haumea": { "inputs": { "nixpkgs": [ - "std-ext", + "omnibus", "flops", "nixlib" ] }, "locked": { - "lastModified": 1689557889, - "narHash": "sha256-kllmt6JnHlry+WAASdSMDaRwbiuk2dFhkbW3Qz1w8BU=", - "owner": "nix-community", - "repo": "haumea", - "rev": "d6a9593ff2160ce29bf6d905e9ccbcecd66baeef", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "haumea", - "type": "github" - } - }, - "haumea_2": { - "inputs": { - "nixpkgs": "nixpkgs_5" - }, - "locked": { - "lastModified": 1685133229, - "narHash": "sha256-FePm/Gi9PBSNwiDFq3N+DWdfxFq0UKsVVTJS3cQPn94=", + "lastModified": 1697205539, + "narHash": "sha256-gHEy0Q+eEQJkWl6/DpFxXPOlTx/lMU7Pvs/bwoq4OhI=", "owner": "nix-community", "repo": "haumea", - "rev": "34dd58385092a23018748b50f9b23de6266dffc2", + "rev": "fc119c500189f739fec7ad33d111f9c92910eccf", "type": "github" }, "original": { "owner": "nix-community", - "ref": "v0.2.2", "repo": "haumea", "type": "github" } }, - "incl": { - "inputs": { - "nixlib": [ - "std-ext", - "std", - "lib" - ] - }, - "locked": { - "lastModified": 1669263024, - "narHash": "sha256-E/+23NKtxAqYG/0ydYgxlgarKnxmDbg6rCMWnOBqn9Q=", - "owner": "divnix", - "repo": "incl", - "rev": "ce7bebaee048e4cd7ebdb4cee7885e00c4e2abca", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "incl", - "type": "github" - } - }, - "lib": { - "locked": { - "lastModified": 1694306727, - "narHash": "sha256-26fkTOJOI65NOTNKFvtcJF9mzzf/kK9swHzfYt1Dl6Q=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "c30b6a84c0b84ec7aecbe74466033facc9ed103f", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nix-filter": { - "locked": { - "lastModified": 1687178632, - "narHash": "sha256-HS7YR5erss0JCaUijPeyg2XrisEb959FIct3n2TMGbE=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "d90c75e8319d0dd9be67d933d8eb9d0894ec9174", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "nix-filter", - "type": "github" - } - }, - "nixago": { - "inputs": { - "flake-utils": "flake-utils", - "nixago-exts": "nixago-exts", - "nixpkgs": [ - "std-ext", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1687381756, - "narHash": "sha256-IUMIlYfrvj7Yli4H2vvyig8HEPpfCeMaE6+kBGPzFyk=", - "owner": "nix-community", - "repo": "nixago", - "rev": "dacceb10cace103b3e66552ec9719fa0d33c0dc9", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixago", - "type": "github" - } - }, - "nixago-exts": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixago": "nixago_2", - "nixpkgs": [ - "std-ext", - "nixago", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1676070308, - "narHash": "sha256-QaJ65oc2l8iwQIGWUJ0EKjCeSuuCM/LqR8RauxZUUkc=", - "owner": "nix-community", - "repo": "nixago-extensions", - "rev": "e5380cb0456f4ea3c86cf94e3039eb856bf07d0b", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixago-extensions", - "type": "github" - } - }, - "nixago-exts_2": { - "inputs": { - "flake-utils": "flake-utils_4", - "nixago": "nixago_3", - "nixpkgs": [ - "std-ext", - "nixago", - "nixago-exts", - "nixago", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1655508669, - "narHash": "sha256-BDDdo5dZQMmwNH/GNacy33nPBnCpSIydWFPZs0kkj/g=", - "owner": "nix-community", - "repo": "nixago-extensions", - "rev": "3022a932ce109258482ecc6568c163e8d0b426aa", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixago-extensions", - "type": "github" - } - }, - "nixago_2": { - "inputs": { - "flake-utils": "flake-utils_3", - "nixago-exts": "nixago-exts_2", - "nixpkgs": [ - "std-ext", - "nixago", - "nixago-exts", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1676070010, - "narHash": "sha256-iYzJIWptE1EUD8VINAg66AAMUajizg8JUYN3oBmb8no=", - "owner": "nix-community", - "repo": "nixago", - "rev": "d480ba6c0c16e2c5c0bd2122852d6a0c9ad1ed0e", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "rename-config-data", - "repo": "nixago", - "type": "github" - } - }, - "nixago_3": { - "inputs": { - "flake-utils": "flake-utils_5", - "nixpkgs": [ - "std-ext", - "nixago", - "nixago-exts", - "nixago", - "nixago-exts", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1655405483, - "narHash": "sha256-Crd49aZWNrpczlRTOwWGfwBMsTUoG9vlHDKQC7cx264=", - "owner": "nix-community", - "repo": "nixago", - "rev": "e6a9566c18063db5b120e69e048d3627414e327d", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixago", - "type": "github" - } - }, "nixlib": { "locked": { - "lastModified": 1653180592, - "narHash": "sha256-sVGwmxTj7CY1D4ioy7E+iJE+1/yHqQlxjnTpar3ap/E=", + "lastModified": 1705193289, + "narHash": "sha256-oL5EAaZHiA3ABLdyKag/DgT+457vmELv8A+eaox2xsI=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "42c5f5785b70cd64b4afd830dc31d0b08461abd5", + "rev": "da839f74dc77c9826fa333b1bc2c8258fd6ffcbe", "type": "github" }, "original": { @@ -586,215 +152,21 @@ "type": "github" } }, - "nixlib_2": { - "locked": { - "lastModified": 1689469483, - "narHash": "sha256-2SBhY7rZQ/iNCxe04Eqxlz9YK9KgbaTMBssq3/BgdWY=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "02fea408f27186f139153e1ae88f8ab2abd9c22c", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1677383253, - "narHash": "sha256-UfpzWfSxkfXHnb4boXZNaKsAcUrZT9Hw+tao1oZxd08=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9952d6bc395f5841262b006fbace8dd7e143b634", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1690370995, - "narHash": "sha256-9z//23jGegLJrf3ITStLwVf715O39dq5u48Kr/XW14U=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f3fbbc36b4e179a5985b9ab12624e9dfe7989341", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1660438583, - "narHash": "sha256-rJUTYxFKlWUJI3njAwEc1pKAVooAViZGJvsgqfh/q/E=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "bbd8f7cd87d0b29294ef3072ffdbd61d60f05da4", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1692190437, - "narHash": "sha256-yJUZzmzSmDYb9ONPnMQDru66RjZgGQZRvj3tQebkexk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9b2aa98db6b10503666a50f4eb93b2fc0d57bde5", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1690272529, - "narHash": "sha256-MakzcKXEdv/I4qJUtq/k/eG+rVmyOZLnYNC2w1mB59Y=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ef99fa5c5ed624460217c31ac4271cfb5cb2502c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1681001314, - "narHash": "sha256-5sDnCLdrKZqxLPK4KA8+f4A3YKO/u6ElpMILvX0g72c=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "367c0e1086a4eb4502b24d872cea2c7acdd557f4", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nosys": { - "locked": { - "lastModified": 1668010795, - "narHash": "sha256-JBDVBnos8g0toU7EhIIqQ1If5m/nyBqtHhL3sicdPwI=", - "owner": "divnix", - "repo": "nosys", - "rev": "feade0141487801c71ff55623b421ed535dbdefa", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "nosys", - "type": "github" - } - }, - "org-roam-book-template": { + "omnibus": { "inputs": { - "cortex": "cortex", - "emacs-overlay": "emacs-overlay", - "flake-utils": "flake-utils_7", - "nix-filter": "nix-filter", - "nixpkgs": [ - "std-ext", - "nixpkgs" - ], - "ox-hugo": "ox-hugo" + "flops": "flops" }, "locked": { - "lastModified": 1690491859, - "narHash": "sha256-m50lZ8IU04pBsFaRvGmrUB47an3dGm2vRZPJ56yB49Y=", + "lastModified": 1708848121, + "narHash": "sha256-aXHvmDnd1Q4Oz1Cpa0oXNhHhmQrJT5kZaztyu1qmMCU=", "owner": "gtrunsec", - "repo": "org-roam-book-template", - "rev": "e866a31a36ce3f8673c08f5d1053646c3aa8acc8", + "repo": "omnibus", + "rev": "9072c648ef8296ff6866fc109f0fcf3c2ba8b35d", "type": "github" }, "original": { "owner": "gtrunsec", - "repo": "org-roam-book-template", - "type": "github" - } - }, - "ox-hugo": { - "flake": false, - "locked": { - "lastModified": 1689004512, - "narHash": "sha256-eMS2aR9DZMN/t5bt31Jsi8a2pCqKopQKjqXbNl6VHKY=", - "owner": "kaushalmodi", - "repo": "ox-hugo", - "rev": "cb1b6cfd7b080e889352150416c1725f11ba937a", - "type": "github" - }, - "original": { - "owner": "kaushalmodi", - "repo": "ox-hugo", - "type": "github" - } - }, - "paisano": { - "inputs": { - "call-flake": "call-flake_3", - "nixpkgs": [ - "std-ext", - "std", - "nixpkgs" - ], - "nosys": "nosys", - "yants": [ - "std-ext", - "std", - "yants" - ] - }, - "locked": { - "lastModified": 1693982790, - "narHash": "sha256-WTZYlqGUjzzz/PSzcvjEZz2kkwYSXObjeQVrFBaqa2Y=", - "owner": "paisano-nix", - "repo": "core", - "rev": "3e897a19418361ece34841105122ed4f9379ca96", - "type": "github" - }, - "original": { - "owner": "paisano-nix", - "repo": "core", - "type": "github" - } - }, - "paisano-tui": { - "flake": false, - "locked": { - "lastModified": 1694014205, - "narHash": "sha256-u0+T6vMznzfjDMUd01ZXQsrQPMEhMjrQwUPTFsPBR1k=", - "owner": "paisano-nix", - "repo": "tui", - "rev": "587ab9fd07bd969d59df73bfe527b5f8a4e752d1", - "type": "github" - }, - "original": { - "owner": "paisano-nix", - "ref": "0.2.0", - "repo": "tui", + "repo": "omnibus", "type": "github" } }, @@ -802,184 +174,28 @@ "inputs": { "call-flake": "call-flake", "namaka": [], - "nixpkgs": [ - "std-ext", - "nixpkgs" - ], - "std": [ - "std-ext", - "std" - ], - "std-ext": "std-ext" - } - }, - "std": { - "inputs": { - "arion": [ - "std-ext", - "std", - "blank" - ], - "blank": "blank", - "devshell": [ - "std-ext", - "devshell" - ], - "dmerge": "dmerge_2", - "haumea": "haumea_2", - "incl": "incl", - "lib": "lib", - "makes": [ - "std-ext", - "std", - "blank" - ], - "microvm": [ - "std-ext", - "std", - "blank" - ], - "n2c": [ - "std-ext", - "std", - "blank" - ], - "nixago": [ - "std-ext", - "nixago" - ], - "nixpkgs": [ - "std-ext", - "nixpkgs" - ], - "paisano": "paisano", - "paisano-tui": "paisano-tui", - "terranix": [ - "std-ext", - "std", - "blank" - ], - "yants": "yants_2" - }, - "locked": { - "lastModified": 1694795560, - "narHash": "sha256-zRSBVfgWMqOuLg74pQKiZv5Jz34lXVlg9rnHolBtB9s=", - "owner": "divnix", - "repo": "std", - "rev": "927807fc745e158b05b8c7daa733b9412a6322f2", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "std", - "type": "github" - } - }, - "std-ext": { - "inputs": { - "devshell": "devshell", - "flops": "flops", - "nixago": "nixago", - "nixpkgs": "nixpkgs_3", - "org-roam-book-template": "org-roam-book-template", - "std": "std" - }, - "locked": { - "lastModified": 1694809007, - "narHash": "sha256-roWdj2iGzoY9Pq8AMtfkhpd56aRjELmUEteD3Dk6e/o=", - "owner": "gtrunsec", - "repo": "std-ext", - "rev": "93b5aec9c0d42e2d0dd1ecc76cbbe741b136f6e9", - "type": "github" - }, - "original": { - "owner": "gtrunsec", - "repo": "std-ext", - "type": "github" - } - }, - "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" + "omnibus": "omnibus" } }, "yants": { - "inputs": { - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1686863218, - "narHash": "sha256-kooxYm3/3ornWtVBNHM3Zh020gACUyFX2G0VQXnB+mk=", - "owner": "divnix", - "repo": "yants", - "rev": "8f0da0dba57149676aa4817ec0c880fbde7a648d", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "yants", - "type": "github" - } - }, - "yants_2": { "inputs": { "nixpkgs": [ - "std-ext", - "std", - "haumea", - "nixpkgs" + "omnibus", + "flops", + "nixlib" ] }, "locked": { - "lastModified": 1686863218, - "narHash": "sha256-kooxYm3/3ornWtVBNHM3Zh020gACUyFX2G0VQXnB+mk=", + "lastModified": 1699522279, + "narHash": "sha256-ILTqQyhVsouZDfbhEVFJI6b3NDZIQQRluL2dk3bee+Y=", "owner": "divnix", "repo": "yants", - "rev": "8f0da0dba57149676aa4817ec0c880fbde7a648d", + "rev": "cde27c2821d925245303650c2914d4b7d3a435cd", "type": "github" }, "original": { "owner": "divnix", + "ref": "refs/pull/5/head", "repo": "yants", "type": "github" } diff --git a/local/flake.nix b/local/flake.nix index f5bac9e..679b4c1 100755 --- a/local/flake.nix +++ b/local/flake.nix @@ -1,32 +1,37 @@ { description = "Flops"; - inputs.std.follows = "std-ext/std"; - inputs.nixpkgs.follows = "std-ext/nixpkgs"; - inputs.std-ext.url = "github:gtrunsec/std-ext"; + inputs.omnibus.url = "github:gtrunsec/omnibus"; inputs.call-flake.url = "github:divnix/call-flake"; inputs.namaka.follows = ""; outputs = - { std, ... }@inputs: + { ... }@inputs: let + inherit (inputs.omnibus.flake.inputs) std nixpkgs; main = inputs.call-flake ../.; in std.growOn { - inherit inputs; + inputs = inputs // { + inherit std nixpkgs; + }; cellsFrom = ./cells; cellBlocks = with std.blockTypes; [ # Development Environments - (nixago "configs") + (nixago "nixago") + (functions "pops") (devshells "devshells") + (data "configs") ]; } { - devShells = std.harvest inputs.self [ [ - "repo" - "devshells" - ] ]; + devShells = std.harvest inputs.self [ + [ + "repo" + "devshells" + ] + ]; } { checks = inputs.namaka.lib.load {