diff options
| author | pennae <github@quasiparticle.net> | 2022-08-30 12:35:47 +0200 |
|---|---|---|
| committer | pennae <github@quasiparticle.net> | 2022-08-31 16:27:24 +0200 |
| commit | 0cfcb5908cc7164236f78cd21e02cc168dd028ac (patch) | |
| tree | fc1a77405167e49fd1250130551546ac7b2709c7 /nixos/modules/system | |
| parent | 5841c386a0ce5fc02b1d32a2e423e81923c32052 (diff) | |
| download | nixlib-0cfcb5908cc7164236f78cd21e02cc168dd028ac.tar nixlib-0cfcb5908cc7164236f78cd21e02cc168dd028ac.tar.gz nixlib-0cfcb5908cc7164236f78cd21e02cc168dd028ac.tar.bz2 nixlib-0cfcb5908cc7164236f78cd21e02cc168dd028ac.tar.lz nixlib-0cfcb5908cc7164236f78cd21e02cc168dd028ac.tar.xz nixlib-0cfcb5908cc7164236f78cd21e02cc168dd028ac.tar.zst nixlib-0cfcb5908cc7164236f78cd21e02cc168dd028ac.zip | |
nixos/*: <screen> -> <programlisting>
most of the screen tags used in option docs are actually listings of some sort. nsd had a notable exception where its screen usage was pretty much a raw markdown block that made most sense to convert into docbook lists.
Diffstat (limited to 'nixos/modules/system')
| -rw-r--r-- | nixos/modules/system/activation/top-level.nix | 6 | ||||
| -rw-r--r-- | nixos/modules/system/boot/initrd-ssh.nix | 11 |
2 files changed, 9 insertions, 8 deletions
diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index 76150cc95999..9f27727cbf8b 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -172,9 +172,9 @@ in To switch to a specialised configuration (e.g. <literal>fewJobsManyCores</literal>) at runtime, run: - <screen> - <prompt># </prompt>sudo /run/current-system/specialisation/fewJobsManyCores/bin/switch-to-configuration test - </screen> + <programlisting> + sudo /run/current-system/specialisation/fewJobsManyCores/bin/switch-to-configuration test + </programlisting> ''; type = types.attrsOf (types.submodule ( local@{ ... }: let diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix index 265399e562fc..171c51308a79 100644 --- a/nixos/modules/system/boot/initrd-ssh.nix +++ b/nixos/modules/system/boot/initrd-ssh.nix @@ -51,12 +51,13 @@ in Specify SSH host keys to import into the initrd. To generate keys, use - <citerefentry><refentrytitle>ssh-keygen</refentrytitle><manvolnum>1</manvolnum></citerefentry>: + <citerefentry><refentrytitle>ssh-keygen</refentrytitle><manvolnum>1</manvolnum></citerefentry> + as root: - <screen> - <prompt># </prompt>ssh-keygen -t rsa -N "" -f /etc/secrets/initrd/ssh_host_rsa_key - <prompt># </prompt>ssh-keygen -t ed25519 -N "" -f /etc/secrets/initrd/ssh_host_ed25519_key - </screen> + <programlisting> + ssh-keygen -t rsa -N "" -f /etc/secrets/initrd/ssh_host_rsa_key + ssh-keygen -t ed25519 -N "" -f /etc/secrets/initrd/ssh_host_ed25519_key + </programlisting> <warning> <para> |