diff --git a/docs/manual/configuring.md b/docs/manual/configuring.md index 28c7e66a..95195f78 100644 --- a/docs/manual/configuring.md +++ b/docs/manual/configuring.md @@ -8,7 +8,7 @@ your convenience. You might also be interested in the [helpful tips section] for more advanced or unusual configuration options supported by nvf. Note that this section does not cover module _options_. For an overview of all -module options provided by nvf, please visit the [appendix](/options.html) +module options provided by nvf, please visit the [appendix](/nvf/options.html) ```{=include=} chapters configuring/custom-package.md diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index d745cb78..8c88cd56 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -454,3 +454,12 @@ - Add [supermaven-nvim] plugin in `vim.assistant.supermaven-nvim` with `enable` and `setupOpts` +[trueNAHO](https://github.com/trueNAHO): + +- `flake-parts`'s `nixpkgs-lib` input follows nvf's `nixpkgs` input to reduce + download size. + +- `flake-utils`'s `systems` inputs follows nvf's `systems` input to transitively + leverage the pattern introduced in commit [fc8206e7a61d ("flake: utilize + nix-systems for overridable flake systems")]( + https://github.com/NotAShelf/nvf/commit/fc8206e7a61d7eb02006f9010e62ebdb3336d0d2). diff --git a/flake.lock b/flake.lock index fb0c5599..c530031d 100644 --- a/flake.lock +++ b/flake.lock @@ -2,7 +2,9 @@ "nodes": { "flake-parts": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib" + "nixpkgs-lib": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1749398372, @@ -20,7 +22,9 @@ }, "flake-utils": { "inputs": { - "systems": "systems" + "systems": [ + "systems" + ] }, "locked": { "lastModified": 1731533236, @@ -67,28 +71,13 @@ "type": "github" } }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1748740939, - "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "656a64127e9d791a334452c6b6606d17539476e2", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, "root": { "inputs": { "flake-parts": "flake-parts", "flake-utils": "flake-utils", "mnw": "mnw", "nixpkgs": "nixpkgs", - "systems": "systems_2" + "systems": "systems" } }, "systems": { @@ -105,21 +94,6 @@ "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" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 16d4b0c7..35f69ea6 100644 --- a/flake.nix +++ b/flake.nix @@ -76,8 +76,17 @@ inputs = { ## Basic Inputs nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - flake-parts.url = "github:hercules-ci/flake-parts"; - flake-utils.url = "github:numtide/flake-utils"; + + flake-parts = { + url = "github:hercules-ci/flake-parts"; + inputs.nixpkgs-lib.follows = "nixpkgs"; + }; + + flake-utils = { + url = "github:numtide/flake-utils"; + inputs.systems.follows = "systems"; + }; + systems.url = "github:nix-systems/default"; # Alternate neovim-wrapper