From 7a6af207936085ad7aa3ab0eaad074510525c637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Chocholat=C3=BD?= Date: Sun, 28 Jan 2024 14:32:30 +0000 Subject: [PATCH 1/3] Fix typo --- docs/nixos-with-flakes/nixos-with-flakes-enabled.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/nixos-with-flakes/nixos-with-flakes-enabled.md b/docs/nixos-with-flakes/nixos-with-flakes-enabled.md index 9eef956..9579ab4 100644 --- a/docs/nixos-with-flakes/nixos-with-flakes-enabled.md +++ b/docs/nixos-with-flakes/nixos-with-flakes-enabled.md @@ -125,7 +125,7 @@ Note that the copied template cannot be used directly. You need to modify it to # # A Nixpkgs Module can be an attribute set, or a function that # returns an attribute set. By default, if a Nixpkgs Module is a - # function, this function have the following default parameters: + # function, this function has the following default parameters: # # lib: the nixpkgs function library, which provides many # useful functions for operating Nix expressions: From 9a99fff04c5dd39dcd9f37e58cea8e8c26a82a6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Chocholat=C3=BD?= Date: Sun, 28 Jan 2024 15:44:23 +0100 Subject: [PATCH 2/3] Fix wording --- docs/nixos-with-flakes/nixos-with-flakes-enabled.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/nixos-with-flakes/nixos-with-flakes-enabled.md b/docs/nixos-with-flakes/nixos-with-flakes-enabled.md index 9579ab4..de051fa 100644 --- a/docs/nixos-with-flakes/nixos-with-flakes-enabled.md +++ b/docs/nixos-with-flakes/nixos-with-flakes-enabled.md @@ -149,9 +149,9 @@ Note that the copied template cannot be used directly. You need to modify it to # to the submodules, # you'll have to manually configure these parameters using # `specialArgs`. - # you must use `specialArgs` by uncomment the following line: + # you must use `specialArgs` by uncommenting the following line: # - # specialArgs = {...}; # pass custom arguments into all sub module. + # specialArgs = {...}; # pass custom arguments into all submodules. modules = [ # Import the configuration.nix here, so that the # old configuration file can still take effect. From 33d54027be5044ab24ebc31879f9297beb2acab9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Chocholat=C3=BD?= Date: Sun, 28 Jan 2024 15:56:32 +0100 Subject: [PATCH 3/3] Improve wording --- docs/nixos-with-flakes/nixos-with-flakes-enabled.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/nixos-with-flakes/nixos-with-flakes-enabled.md b/docs/nixos-with-flakes/nixos-with-flakes-enabled.md index de051fa..b3de85c 100644 --- a/docs/nixos-with-flakes/nixos-with-flakes-enabled.md +++ b/docs/nixos-with-flakes/nixos-with-flakes-enabled.md @@ -175,7 +175,7 @@ The comments in the above code are already quite detailed, but let's emphasize a 2. In `specialArgs = {...};`, the content of the attribute set is omitted here. Its contents are automatically injected into submodules through name matching. 1. A common usage, for instance, is to directly write `specialArgs = inputs;`, enabling all data sources from the `inputs` attribute set to be used in the submodules. - 2. If you do not want to mixed all the data sources in `inputs` with the defaults, use `specialArgs = {inherit inputs;};`(akin `specialArgs = {inputs = inputs;};`) instead. + 2. If you do not want to get all the data sources in `inputs` mixed with the defaults, use `specialArgs = {inherit inputs;};`(akin to `specialArgs = {inputs = inputs;};`) instead. ## Managing System Packages with Flakes