lol

Merge pull request #264564 from nikstur/repart-image-builder-docs-in-manual

nixos/image: move repart image builder docs into manual

authored by

nikstur and committed by
GitHub
ccd11083 87f99309

+31 -27
+1
nixos/doc/manual/installation/installation.md
··· 8 8 changing-config.chapter.md 9 9 upgrading.chapter.md 10 10 building-nixos.chapter.md 11 + building-images-via-systemd-repart.chapter.md 11 12 ```
nixos/modules/image/repart.md nixos/doc/manual/installation/building-images-via-systemd-repart.chapter.md
+25 -26
nixos/modules/image/repart.nix
··· 34 34 }; 35 35 }); 36 36 default = { }; 37 - example = lib.literalExpression '' { 38 - "/EFI/BOOT/BOOTX64.EFI".source = 39 - "''${pkgs.systemd}/lib/systemd/boot/efi/systemd-bootx64.efi"; 37 + example = lib.literalExpression '' 38 + { 39 + "/EFI/BOOT/BOOTX64.EFI".source = 40 + "''${pkgs.systemd}/lib/systemd/boot/efi/systemd-bootx64.efi"; 40 41 41 - "/loader/entries/nixos.conf".source = systemdBootEntry; 42 - } 42 + "/loader/entries/nixos.conf".source = systemdBootEntry; 43 + } 43 44 ''; 44 45 description = lib.mdDoc "The contents to end up in the filesystem image."; 45 46 }; ··· 96 97 partitions = lib.mkOption { 97 98 type = with lib.types; attrsOf (submodule partitionOptions); 98 99 default = { }; 99 - example = lib.literalExpression '' { 100 - "10-esp" = { 101 - contents = { 102 - "/EFI/BOOT/BOOTX64.EFI".source = 103 - "''${pkgs.systemd}/lib/systemd/boot/efi/systemd-bootx64.efi"; 104 - } 105 - repartConfig = { 106 - Type = "esp"; 107 - Format = "fat"; 100 + example = lib.literalExpression '' 101 + { 102 + "10-esp" = { 103 + contents = { 104 + "/EFI/BOOT/BOOTX64.EFI".source = 105 + "''${pkgs.systemd}/lib/systemd/boot/efi/systemd-bootx64.efi"; 106 + } 107 + repartConfig = { 108 + Type = "esp"; 109 + Format = "fat"; 110 + }; 108 111 }; 109 - }; 110 - "20-root" = { 111 - storePaths = [ config.system.build.toplevel ]; 112 - repartConfig = { 113 - Type = "root"; 114 - Format = "ext4"; 115 - Minimize = "guess"; 112 + "20-root" = { 113 + storePaths = [ config.system.build.toplevel ]; 114 + repartConfig = { 115 + Type = "root"; 116 + Format = "ext4"; 117 + Minimize = "guess"; 118 + }; 116 119 }; 117 120 }; 118 - }; 119 121 ''; 120 122 description = lib.mdDoc '' 121 123 Specify partitions as a set of the names of the partitions with their ··· 206 208 | tee repart-output.json 207 209 ''; 208 210 209 - meta = { 210 - maintainers = with lib.maintainers; [ nikstur ]; 211 - doc = ./repart.md; 212 - }; 211 + meta.maintainers = with lib.maintainers; [ nikstur ]; 213 212 214 213 }; 215 214 }
+5 -1
nixos/modules/module-list.nix
··· 1531 1531 ./virtualisation/waydroid.nix 1532 1532 ./virtualisation/xe-guest-utilities.nix 1533 1533 ./virtualisation/xen-dom0.nix 1534 - { documentation.nixos.extraModules = [ ./virtualisation/qemu-vm.nix ]; } 1534 + { documentation.nixos.extraModules = [ 1535 + ./virtualisation/qemu-vm.nix 1536 + ./image/repart.nix 1537 + ]; 1538 + } 1535 1539 ]