From 40b5fc05ee576b73fca0ba09c2f2f759fe22cd61 Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Thu, 11 Jan 2024 10:13:31 +0800
Subject: [PATCH] feat: update nixos-with-flakes-enabled

---
 docs/nixos-with-flakes/nixos-with-flakes-enabled.md | 13 +++++++++----
 .../nixos-with-flakes/nixos-with-flakes-enabled.md  | 13 +++++++++----
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/docs/nixos-with-flakes/nixos-with-flakes-enabled.md b/docs/nixos-with-flakes/nixos-with-flakes-enabled.md
index 62d59eb..caf4464 100644
--- a/docs/nixos-with-flakes/nixos-with-flakes-enabled.md
+++ b/docs/nixos-with-flakes/nixos-with-flakes-enabled.md
@@ -175,12 +175,15 @@ 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.
 
 ## Managing System Packages with Flakes
 
 After the switch, we can manage the system using Flakes. One common requirement is installing packages. We have previously seen how to install packages using `environment.systemPackages` from the official `nixpkgs` repository.
 
-Now let's learn how to install packages from other sources using Flakes. This provides greater flexibility, particularly when it comes to specifying software versions. Let's use [Helix](https://github.com/helix-editor/helix) editor as an example.
+Now let's learn how to install packages from other sources using Flakes. This is really useful when you want to use a newer version of some package that is not added into Nixpkgs yet.
+
+Let's use [Helix](https://github.com/helix-editor/helix) editor as an example.
 
 First, we need to add Helix as an input in `flake.nix`:
 
@@ -193,8 +196,8 @@ First, we need to add Helix as an input in `flake.nix`:
   inputs = {
     # ...
 
-    # Helix editor, version - 23.10
-    helix.url = "github:helix-editor/helix/23.10";
+    # Helix editor, the master branch
+    helix.url = "github:helix-editor/helix/master";
   };
 
   outputs = inputs@{ self, nixpkgs, ... }: {
@@ -239,7 +242,9 @@ Next, update `configuration.nix` to install `helix` from the `helix` input:
 }
 ```
 
-To deploy the changes, run `sudo nixos-rebuild switch`. After that, you can start the Helix editor by running the `hx` command.
+To deploy the changes, run `sudo nixos-rebuild switch`, this will take a while to compile the latest Helix.
+
+After that, you can start the Helix editor by running the `hx` command.
 
 > If your system's hostname is not `nixos-test`, you need to modify the name of `nixosConfigurations` in `flake.nix`, or use `--flake /etc/nixos#nixos-test` to specify the configuration name.
 
diff --git a/docs/zh/nixos-with-flakes/nixos-with-flakes-enabled.md b/docs/zh/nixos-with-flakes/nixos-with-flakes-enabled.md
index e5f301a..6399bfd 100644
--- a/docs/zh/nixos-with-flakes/nixos-with-flakes-enabled.md
+++ b/docs/zh/nixos-with-flakes/nixos-with-flakes-enabled.md
@@ -158,12 +158,14 @@ cat flake.nix
 1. `lib` `pkgs` `config` 等默认参数都由 Nixpkgs 自动生成，并可被自动注入到子模块，无需在此处额外声明。
 1. `specialArgs = {...};` 这里省略了 attribute set 的内容，其中的内容会被通过名称匹配的方式自动注入到子模块中。
     1. 常见用法比如直接写 `specialArgs = inputs;`，这样所有 inputs 中的 flake 数据源就都可以在子模块中使用了。
+    2. 如果你不希望把默认参数与 `inputs` 中的数据源混合到一起，可以改用 `specialArgs = {inherit inputs;};`（即 `specialArgs = {inputs = inputs;};`）.
 
 ## 通过 Flakes 来管理系统软件 {#manage-system-software-with-flakes}
 
 切换完毕后，我们就可以通过 Flakes 来管理系统了。管系统最常见的需求就是装软件，我们在前面已经见识过如何通过 `environment.systemPackages` 来安装 `pkgs` 中的包，这些包都来自官方的 nixpkgs 仓库。
 
-现在我们学习下如何通过 Flakes 安装其他来源的软件包，这比直接安装 nixpkgs 要灵活很多，最显而易见的好处是你可以很方便地设定软件的版本。
+现在我们学习下如何通过 Flakes 安装其他来源的软件包，这比直接安装 nixpkgs 要灵活很多，最主要的用途是用来使用 Nixpkgs 中还未添加的某个包的新版本。
+
 以 [helix](https://github.com/helix-editor/helix) 编辑器为例，我们首先需要在 `flake.nix` 中添加 helix 这个 inputs 数据源：
 
 ```nix{10,20}
@@ -175,8 +177,8 @@ cat flake.nix
   inputs = {
     # ......
 
-    # helix editor, use tag 23.10
-    helix.url = "github:helix-editor/helix/23.10";
+    # helix editor, use the master branch
+    helix.url = "github:helix-editor/helix/master";
   };
 
   outputs = inputs@{ self, nixpkgs, ... }: {
@@ -220,7 +222,10 @@ cat flake.nix
 }
 ```
 
-改好后再 `sudo nixos-rebuild switch` 部署，就能安装好 helix 程序了，可直接在终端使用 `hx` 命令测试验证。
+改好后再 `sudo nixos-rebuild switch` 部署，就能安装好 Helix 程序了。
+这次部署用时会比以往长挺多，主要是 Nix 会需要使用 master 分支的源码编译整个 Helix.
+
+部署完毕后，可直接在终端使用 `hx` 命令测试验证。
 
 > 如果你的系统 Hostname 不是 `nixos-test`，你需要在 `flake.nix` 中修改 `nixosConfigurations` 的名称，或者使用 `--flake /etc/nixos#nixos-test` 来指定配置名称。