diff options
| author | Emily <vcs@emily.moe> | 2023-06-22 02:34:49 +0100 |
|---|---|---|
| committer | Emily <vcs@emily.moe> | 2023-06-24 10:48:55 +0100 |
| commit | b97c235e37c91511c2e7533ab6794480e4cc445a (patch) | |
| tree | fa312d1c2b5a41fb5165af35cc5803b92d7e6a67 /modules/nix/default.nix | |
| parent | 76ce9faca6e16d348afb9d78a1a13eb19c381b76 (diff) | |
treewide: tweak DocBook docs for conversion
These help `nix-munge-doc` automate more of the Markdown conversion
process. See the following nixpkgs commits for explanations of many
of these changes:
* https://github.com/NixOS/nixpkgs/commit/275a34e0d8a937a81b267e47302dd8a92fa781df
* https://github.com/NixOS/nixpkgs/commit/694d5b19d30bf66687b42fb77f43ea7cd1002a62
* https://github.com/NixOS/nixpkgs/commit/f1d39b6d6187997b630647400c5efe5b01e06a23
* https://github.com/NixOS/nixpkgs/commit/16102dce2fbad670bd47dd75c860a8daa5fe47ad
I couldn't think of any particularly good way to format the
`system.defaults` breadcrumbs, so I just made them standalone
paragraphs. They weren't rendering correctly in DocBook anyway.
Diffstat (limited to 'modules/nix/default.nix')
| -rw-r--r-- | modules/nix/default.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/modules/nix/default.nix b/modules/nix/default.nix index a880941..6c61acc 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -173,11 +173,11 @@ in useDaemon = mkOption { type = types.bool; default = false; - description = " + description = '' If set, Nix will use the daemon to perform operations. Use this instead of services.nix-daemon.enable if you don't wan't the daemon service to be managed for you. - "; + ''; }; distributedBuilds = mkOption { @@ -594,7 +594,7 @@ in then Nix will use a binary from a binary cache if and only if it is signed by <emphasis>any</emphasis> of the keys listed here. By default, only the key for - <uri>cache.nixos.org</uri> is included. + <literal>cache.nixos.org</literal> is included. ''; }; @@ -650,8 +650,7 @@ in <link xlink:href="https://nixos.org/manual/nix/stable/#sec-conf-file"/> for avalaible options. The value declared here will be translated directly to the key-value pairs Nix expects. - </para> - <para> + Nix configurations defined under <option>nix.*</option> will be translated and applied to this option. In addition, configuration specified in <option>nix.extraOptions</option> which will be appended verbatim to the resulting config file. |