diff --git a/.github/workflows/flake-check.yaml b/.github/workflows/flake-check.yaml index a28f80a..eea495a 100644 --- a/.github/workflows/flake-check.yaml +++ b/.github/workflows/flake-check.yaml @@ -20,7 +20,7 @@ jobs: name: Bootstrap templates/minimal runs-on: ubuntu-latest env: - NIX_PATH: "nixpkgs=https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz" + NIX_PATH: "nixpkgs=https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.zst" steps: - uses: wimpysworld/nothing-but-nix@v10 - uses: cachix/install-nix-action@v31 @@ -41,7 +41,7 @@ jobs: name: Bootstrap apps runs-on: ubuntu-latest env: - NIX_PATH: "nixpkgs=https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz" + NIX_PATH: "nixpkgs=https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.zst" # write-tack resolves refs via api.github.com; anonymous rate limits flake on shared runners GITHUB_TOKEN: ${{ github.token }} steps: diff --git a/README.md b/README.md index b568b4b..9bdf312 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,19 @@

- Sponsor Vic + Sponsor Vic - Dendritic Nix - - CI Status - License + Dendritic Nix + + CI Status + License

# Non-static Nix on your flake inputs! Define custom output schemas. -> `flake-file` and [vic](https://bsky.app/profile/oeiuwq.bsky.social)'s [dendritic libs](https://dendritic.oeiuwq.com) made for you with Love++ and AI--. If you like my work, consider [sponsoring](https://dendritic.oeiuwq.com/sponsor) +> If Flake-File or other [denful libs](https://github.com/denful) have been of use to you, consider [sponsoring](https://denful.dev/sponsor). + +> NOTE: Den no longer relates to the "Dendritic" name, Den was born to explore the limits of that pattern and has evolved to something much more advanced and flexible, the official dendritic repo no longer considers this Dendritic. **flake-file** lets you generate a clean, maintainable `flake.nix` from Nix module options. Use the _real_ Nix language to define your inputs. @@ -30,7 +32,7 @@ This means ### Features - Flake definition aggregated from Nix modules. -- [Input](https://github.com/vic/flake-file/blob/main/modules/options/default.nix) and Output schemas based on Nix types. +- [Input](https://github.com/denful/flake-file/blob/main/modules/options/default.nix) and Output schemas based on Nix types. - Syntax for nixConfig and follows is the same as in flakes. - `flake check` ensures files are up to date. - App for `flake.nix` generator: `nix run .#write-flake` @@ -49,11 +51,11 @@ This means -## Learn more: [Documentation](https://flake-file.oeiuwq.com) +## Learn more: [Documentation](https://flake-file.denful.dev) ## Try it Now! ```shell mv flake.nix flake-file.nix -nix-shell https://github.com/vic/flake-file/archive/main.zip -A flake-file.sh --run bootstrap +nix-shell https://github.com/denful/flake-file/archive/main.zip -A flake-file.sh --run bootstrap ``` diff --git a/dev/flake.lock b/dev/flake.lock index d3c1892..e2c2655 100644 --- a/dev/flake.lock +++ b/dev/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1768818222, - "narHash": "sha256-460jc0+CZfyaO8+w8JNtlClB2n4ui1RbHfPTLkpwhU8=", + "lastModified": 1788342953, + "narHash": "sha256-EWkNM4JzBhZ/Yn1PG6lP4/QJuFAFeHYlY5gVxXu940Y=", "owner": "numtide", "repo": "devshell", - "rev": "255a2b1725a20d060f566e4755dbf571bbbb5f76", + "rev": "a67c0f87b63bcbdbdcb56785bec0205a2e3d6026", "type": "github" }, "original": { @@ -38,11 +38,11 @@ ] }, "locked": { - "lastModified": 1778716662, - "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", + "lastModified": 1788450739, + "narHash": "sha256-glZLQlzIn1fXH6PazR2iUmTo7kzzyYSshrWhLS9TqCU=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", + "rev": "31729ca8cbdb4fa927b34e5f4353e6a83f39e993", "type": "github" }, "original": { @@ -53,15 +53,15 @@ }, "import-tree": { "locked": { - "lastModified": 1778781969, - "narHash": "sha256-Jjuz5CmSkur8KvLDoGa+vylEp+RkQtv4mt/qcMznpH0=", - "owner": "vic", + "lastModified": 1788467110, + "narHash": "sha256-ljEMTXP/rH0tOvDzc9gzwww6KcHRPRnEHzd9lK48V7s=", + "owner": "denful", "repo": "import-tree", - "rev": "d321337efd0f23a9eb14a42adb7b2c29313ab274", + "rev": "eb1b52eaecc57f7c136d07ae8a93e724dfecac46", "type": "github" }, "original": { - "owner": "vic", + "owner": "denful", "repo": "import-tree", "type": "github" } @@ -73,11 +73,11 @@ ] }, "locked": { - "lastModified": 1754073254, - "narHash": "sha256-CQp/v2HQ7AtGJQqFGRZLHt4MZAK3NF94I6GDaRyhbsc=", + "lastModified": 1787959246, + "narHash": "sha256-BlHRSxL3VXZsYrnkSURfmxEwGOnH9pZJgnwv5twrGQ4=", "owner": "fzakaria", "repo": "nix-auto-follow", - "rev": "5baa00b79d4cc46523da0b8b3532c5163d151be4", + "rev": "c223b752ce083e4597feeb3de4390728c03634c1", "type": "github" }, "original": { @@ -118,11 +118,11 @@ ] }, "locked": { - "lastModified": 1779338171, - "narHash": "sha256-affUbv/bwE8SLGhuWKniDr7SVO+Lo1XEPjCZdyU5kgQ=", + "lastModified": 1784925540, + "narHash": "sha256-11IOL5tyJbB3vMQzzhIULuPtoHJpkLFz4BaKApm6t0Q=", "owner": "nix-community", "repo": "nix-unit", - "rev": "6ab1f232562a01d18b40d5ed6a58718c4f3a74bc", + "rev": "b3d16367c54621fd073aa8c1dd510042f771f624", "type": "github" }, "original": { @@ -133,15 +133,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1781141223, - "narHash": "sha256-2VqJHoxNTbg68GJ4VbV2jRLol3VX1iB4IlCrsnsz1oc=", - "rev": "b503dde361500433ca25a32e8f4d218bf58fb659", + "lastModified": 1788865024, + "narHash": "sha256-wGIpQyO+07AXZZikwySQEgFozFH4DrXNh1d3S6SJccU=", + "rev": "422d1ae605d7fcd9896412b37dc065c456c0eefb", "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1014844.b503dde36150/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1069753.422d1ae605d7/nixexprs.tar.zst" }, "original": { "type": "tarball", - "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz" + "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.zst" } }, "root": { @@ -163,11 +163,11 @@ ] }, "locked": { - "lastModified": 1780220602, - "narHash": "sha256-eynAfOmbmxJnkp7YewvCEbShNnnYJ9gLLqkzsYtBPeM=", + "lastModified": 1786901030, + "narHash": "sha256-WSFCsDSE5ffgD2MqzkM2CYjeFiKhRF/dJUN8uedb6YE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "db947814a175b7ca6ded66e21383d938df01c227", + "rev": "27b3b12a8e6375f28ebe122f07d230ca5459bbfa", "type": "github" }, "original": { diff --git a/dev/flake.nix b/dev/flake.nix index 119dd52..3fa3f33 100644 --- a/dev/flake.nix +++ b/dev/flake.nix @@ -1,4 +1,4 @@ -# DO-NOT-EDIT. This file was auto-generated using github:vic/flake-file. +# DO-NOT-EDIT. This file was auto-generated using github:denful/flake-file. # Use `nix run .#write-flake` to regenerate it. { outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } (inputs.import-tree ./modules); @@ -13,7 +13,7 @@ url = "github:hercules-ci/flake-parts"; inputs.nixpkgs-lib.follows = "nixpkgs"; }; - import-tree.url = "github:vic/import-tree"; + import-tree.url = "github:denful/import-tree"; nix-auto-follow = { url = "github:fzakaria/nix-auto-follow"; inputs.nixpkgs.follows = "nixpkgs"; @@ -26,7 +26,7 @@ treefmt-nix.follows = "treefmt-nix"; }; }; - nixpkgs.url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"; + nixpkgs.url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.zst"; treefmt-nix = { url = "github:numtide/treefmt-nix"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/docs/astro.config.mjs b/docs/astro.config.mjs index 305ac47..acce986 100644 --- a/docs/astro.config.mjs +++ b/docs/astro.config.mjs @@ -90,7 +90,7 @@ export default defineConfig({ }), ], editLink: { - baseUrl: "https://github.com/vic/flake-file/edit/main/docs/", + baseUrl: "https://github.com/denful/flake-file/edit/main/docs/", }, customCss: ["./src/styles/custom.css"], }), diff --git a/docs/src/components/Ad.astro b/docs/src/components/Ad.astro index d8e5abf..b14dc8f 100644 --- a/docs/src/components/Ad.astro +++ b/docs/src/components/Ad.astro @@ -6,22 +6,22 @@ import { LinkButton, Icon } from '@astrojs/starlight/components';
-

vic/flake-file?

+

denful/flake-file?

- Become a Sponsor - + Become a Sponsor +

- flake-file is part of @vic's Dendritic Ecosystem — made with love and maintained with passion. + flake-file is part of @vic's Dendritic Ecosystem — made with love and maintained with passion.

More @vic OpenSource diff --git a/docs/src/components/FooterLinks.astro b/docs/src/components/FooterLinks.astro index 593658e..d92dfde 100644 --- a/docs/src/components/FooterLinks.astro +++ b/docs/src/components/FooterLinks.astro @@ -3,12 +3,12 @@ import { Icon } from '@astrojs/starlight/components'; ---
- + Contribute - + - + Sponsor @@ -48,4 +48,4 @@ import { Icon } from '@astrojs/starlight/components'; a:hover { color: var(--sl-color-white); } - \ No newline at end of file + diff --git a/docs/src/components/SocialIcons.astro b/docs/src/components/SocialIcons.astro index 0d52260..5126636 100644 --- a/docs/src/components/SocialIcons.astro +++ b/docs/src/components/SocialIcons.astro @@ -4,13 +4,13 @@ import Default from '@astrojs/starlight/components/SocialIcons.astro'; --- - + -Ask DeepWiki +Ask DeepWiki - Vic Dendritic Libs + Vic Dendritic Libs -Sponsor Den +Sponsor Den diff --git a/docs/src/content/docs/explanation/how-it-works.mdx b/docs/src/content/docs/explanation/how-it-works.mdx index 4b42dfe..467700e 100644 --- a/docs/src/content/docs/explanation/how-it-works.mdx +++ b/docs/src/content/docs/explanation/how-it-works.mdx @@ -37,7 +37,7 @@ Any Nix module can set `flake-file.*` options. Because this is the standard Nix ```nix { inputs, lib, ... }: { - flake-file.inputs.nixpkgs.url = lib.mkDefault "github:NixOS/nixpkgs/nixpkgs-unstable"; + flake-file.inputs.nixpkgs.url = lib.mkDefault "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.zst"; flake-file.inputs.nixpkgs-lib.follows = "nixpkgs"; } ``` diff --git a/docs/src/content/docs/explanation/what-is-flake-file.mdx b/docs/src/content/docs/explanation/what-is-flake-file.mdx index 7b0a3dc..0e52e26 100644 --- a/docs/src/content/docs/explanation/what-is-flake-file.mdx +++ b/docs/src/content/docs/explanation/what-is-flake-file.mdx @@ -75,4 +75,4 @@ Many Dendritic Nix layouts use flake-file because it helps with localization of Inputs are declared near where they are used, frequently in the same module. Decomissining the module also removes the inputs. -Even when flake-file was born for flakes, its author [vic/vix](https://github.com/vic/vix) uses flake-file without flakes. The [`dev/`](https://github.com/vic/flake-file/blob/main/dev) directory in this repo eats its own cooking. [More examples on GitHub](https://github.com/search?q=%22vic%2Fflake-file%22+language%3ANix&type=code). +Even when flake-file was born for flakes, its author [vic/vix](https://github.com/vic/vix) uses flake-file without flakes. The [`dev/`](https://github.com/denful/flake-file/blob/main/dev) directory in this repo eats its own cooking. [More examples on GitHub](https://github.com/search?q=%22vic%2Fflake-file%22+language%3ANix&type=code). diff --git a/docs/src/content/docs/guides/flake-modules.mdx b/docs/src/content/docs/guides/flake-modules.mdx index db55971..286b074 100644 --- a/docs/src/content/docs/guides/flake-modules.mdx +++ b/docs/src/content/docs/guides/flake-modules.mdx @@ -15,13 +15,13 @@ The base module. Provides all `flake-file.*` options, the `write-flake` app, and } ``` -Source: [`modules/default.nix`](https://github.com/vic/flake-file/tree/main/modules/default.nix) +Source: [`modules/default.nix`](https://github.com/denful/flake-file/tree/main/modules/default.nix) ## `flakeModules.import-tree` -Adds [import-tree](https://github.com/vic/import-tree) — auto-import all `.nix` files from a directory. +Adds [import-tree](https://github.com/denful/import-tree) — auto-import all `.nix` files from a directory. -Source: [`modules/import-tree.nix`](https://github.com/vic/flake-file/tree/main/modules/import-tree.nix) +Source: [`modules/import-tree.nix`](https://github.com/denful/flake-file/tree/main/modules/import-tree.nix) ## `flakeModules.dendritic` @@ -38,13 +38,13 @@ A batteries-included setup for [Dendritic](https://vic.github.io/dendrix/Dendrit flake-file = { description = "My Awesome Flake"; - inputs.nixpkgs.url = lib.mkDefault "github:NixOS/nixpkgs/nixpkgs-unstable"; + inputs.nixpkgs.url = lib.mkDefault "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.zst"; inputs.nixpkgs-lib.follows = "nixpkgs"; }; } ``` -Source: [`modules/dendritic/default.nix`](https://github.com/vic/flake-file/tree/main/modules/dendritic/default.nix) +Source: [`modules/dendritic/default.nix`](https://github.com/denful/flake-file/tree/main/modules/dendritic/default.nix) ## `lib.flakeModules.flake-parts-builder` @@ -60,40 +60,40 @@ Integrates [flake-parts-builder](https://github.com/tsandrini/flake-parts-builde See [flake-parts-builder guide](/guides/flake-parts-builder) for details. -Source: [`modules/flake-parts-builder/default.nix`](https://github.com/vic/flake-file/tree/main/modules/flake-parts-builder/default.nix) +Source: [`modules/flake-parts-builder/default.nix`](https://github.com/denful/flake-file/tree/main/modules/flake-parts-builder/default.nix) ## `flakeModules.allfollow` Enables automatic `flake.lock` flattening using [spikespaz/allfollow](https://github.com/spikespaz/allfollow). -Source: [`modules/prune-lock/allfollow.nix`](https://github.com/vic/flake-file/tree/main/modules/prune-lock/allfollow.nix) +Source: [`modules/prune-lock/allfollow.nix`](https://github.com/denful/flake-file/tree/main/modules/prune-lock/allfollow.nix) ## `flakeModules.nix-auto-follow` Enables automatic `flake.lock` flattening using [fzakaria/nix-auto-follow](https://github.com/fzakaria/nix-auto-follow). -Source: [`modules/prune-lock/nix-auto-follow.nix`](https://github.com/vic/flake-file/tree/main/modules/prune-lock/nix-auto-follow.nix) +Source: [`modules/prune-lock/nix-auto-follow.nix`](https://github.com/denful/flake-file/tree/main/modules/prune-lock/nix-auto-follow.nix) ## `flakeModules.auto-follow` Enables automatic `follows` declarations maintained by [`flake-edit follow`](https://github.com/a-kenji/flake-edit). This is an alternative to the lock-flattening modules above. -Source: [`modules/auto-follow.nix`](https://github.com/vic/flake-file/tree/main/modules/auto-follow.nix) +Source: [`modules/auto-follow.nix`](https://github.com/denful/flake-file/tree/main/modules/auto-follow.nix) ## `flakeModules.npins` Defines `flake-file` options for [npins](https://github.com/andir/npins)-based environments. Exposes `write-npins`. Supports `github`, `gitlab`, `channel`, `tarball`, and `git` schemes. Respects `follows` for deduplication. Prunes stale pins automatically. -Source: [`modules/npins`](https://github.com/vic/flake-file/tree/main/modules/npins) +Source: [`modules/npins`](https://github.com/denful/flake-file/tree/main/modules/npins) ## `flakeModules.unflake` Defines `flake-file` options for [unflake](https://codeberg.org/goldstein/unflake)-based environments. Exposes `write-unflake`. -Source: [`modules/unflake`](https://github.com/vic/flake-file/tree/main/modules/unflake) +Source: [`modules/unflake`](https://github.com/denful/flake-file/tree/main/modules/unflake) ## `flakeModules.tack` Defines `flake-file` options for [tack](https://github.com/manic-systems/tack)-based environments: flake-like TOML pins, lazily fetched, with no `flake.lock`. Exposes `write-tack`, which renders `flake-file.inputs` into `.tack/pins.toml` and runs `tack update` to produce `.tack/pins.lock.json`. Extends `flake-file.inputs.` with `tackType` (`flake`/`fetch`/`fixed`) and `unpack` (`tarball`/`file`) pin fields. Configure via `flake-file.tack.*` (package, shorturls, all-follow rules, recomposability, resolver overrides). -Source: [`modules/tack`](https://github.com/vic/flake-file/tree/main/modules/tack) +Source: [`modules/tack`](https://github.com/denful/flake-file/tree/main/modules/tack) diff --git a/docs/src/content/docs/guides/lock-flattening.mdx b/docs/src/content/docs/guides/lock-flattening.mdx index 0d58bf0..0b77531 100644 --- a/docs/src/content/docs/guides/lock-flattening.mdx +++ b/docs/src/content/docs/guides/lock-flattening.mdx @@ -23,7 +23,7 @@ flake-file ships support for two established flattening tools: } ``` -Source: [`modules/prune-lock/allfollow.nix`](https://github.com/vic/flake-file/tree/main/modules/prune-lock/allfollow.nix) +Source: [`modules/prune-lock/allfollow.nix`](https://github.com/denful/flake-file/tree/main/modules/prune-lock/allfollow.nix) ### nix-auto-follow @@ -35,7 +35,7 @@ Source: [`modules/prune-lock/allfollow.nix`](https://github.com/vic/flake-file/t } ``` -Source: [`modules/prune-lock/nix-auto-follow.nix`](https://github.com/vic/flake-file/tree/main/modules/prune-lock/nix-auto-follow.nix) +Source: [`modules/prune-lock/nix-auto-follow.nix`](https://github.com/denful/flake-file/tree/main/modules/prune-lock/nix-auto-follow.nix) ## How it integrates diff --git a/docs/src/content/docs/guides/templates.mdx b/docs/src/content/docs/guides/templates.mdx index 46582f3..9b336e8 100644 --- a/docs/src/content/docs/guides/templates.mdx +++ b/docs/src/content/docs/guides/templates.mdx @@ -6,7 +6,7 @@ description: Ready-made project templates for flake-file. flake-file ships several Nix flake templates. Initialise any of them with: ```shell -nix flake init -t github:vic/flake-file#