rincewind: Tangle mkinitcpio settings into included conf files

Don't include the whole file, that's likely to change over time. Only add those
settings that are needed.

1 files changed, 14 insertions, 70 deletions

diff --git a/rincewind.org b/rincewind.org
index ee30a1d..b96152d 100644
--- a/rincewind.org
+++ b/rincewind.org
@@ -10,7 +10,7 @@ Disable the PC Speaker because I get annoyed at it beeping at me all the time.
 
 Enable the =amdgpu= module because I have an AMD video card.
 
-#+begin_src conf-unix :noweb-ref mkinitcpio-modules
+#+begin_src sh :tangle "/sudo::/etc/mkinitcpio.conf.d/amdgpu.conf"
   MODULES=(amdgpu)
 #+end_src
 
@@ -18,79 +18,23 @@ Set up the hooks loaded into the image. Use =mkinitcpio -H <MODULE>= to find out
 
 - =base= :: Crucial runtime necessities for booting. Should always be included.
 - =udev= :: Adds the udev daemon to the initramfs to allow dynamic loading of modules and reliable detection of the root device via UUID.
-- =autodetect= ::
+- =autodetect= :: ???
+- =microcode= :: ???
+- =modconf= :: ???
+- =kms= :: ???
+- =keyboard= :: ???
+- =keymap= :: ???
+- =consolefont= :: ???
+- =block= :: ???
+- =encrypt= :: Decrypt encrypted root drive.
+- =filesystems= :: ???
+- =fsck= :: ???
 
-#+begin_src conf-unix :noweb-ref mkinitcpio-hooks
-  HOOKS=(base udev autodetect modconf block keymap consolefont encrypt filesystems keyboard fsck)
+#+begin_src sh :tangle "/sudo::/etc/mkinitcpio.conf.d/hooks.conf"
+  HOOKS=(base udev autodetect microcode modconf kms keyboard keymap consolefont block encrypt filesystems fsck)
 #+end_src
 
-#+begin_src conf-unix :noweb yes
-  # vim:set ft=sh
-  # MODULES
-  # The following modules are loaded before any boot hooks are
-  # run.  Advanced users may wish to specify all system modules
-  # in this array.  For instance:
-  #     MODULES=(piix ide_disk reiserfs)
-  <<mkinitcpio-modules>>
 
-  # BINARIES
-  # This setting includes any additional binaries a given user may
-  # wish into the CPIO image.  This is run last, so it may be used to
-  # override the actual binaries included by a given hook
-  # BINARIES are dependency parsed, so you may safely ignore libraries
-  BINARIES=()
 
-  # FILES
-  # This setting is similar to BINARIES above, however, files are added
-  # as-is and are not parsed in any way.  This is useful for config files.
-  FILES=()
 
-  # HOOKS
-  # This is the most important setting in this file.  The HOOKS control the
-  # modules and scripts added to the image, and what happens at boot time.
-  # Order is important, and it is recommended that you do not change the
-  # order in which HOOKS are added.  Run 'mkinitcpio -H <hook name>' for
-  # help on a given hook.
-  # 'base' is _required_ unless you know precisely what you are doing.
-  # 'udev' is _required_ in order to automatically load modules
-  # 'filesystems' is _required_ unless you specify your fs modules in MODULES
-  # Examples:
-  ##   This setup specifies all modules in the MODULES setting above.
-  ##   No raid, lvm2, or encrypted root is needed.
-  #    HOOKS=(base)
-  #
-  ##   This setup will autodetect all modules for your system and should
-  ##   work as a sane default
-  #    HOOKS=(base udev autodetect block filesystems)
-  #
-  ##   This setup will generate a 'full' image which supports most systems.
-  ##   No autodetection is done.
-  #    HOOKS=(base udev block filesystems)
-  #
-  ##   This setup assembles a pata mdadm array with an encrypted root FS.
-  ##   Note: See 'mkinitcpio -H mdadm' for more information on raid devices.
-  #    HOOKS=(base udev block mdadm encrypt filesystems)
-  #
-  ##   This setup loads an lvm2 volume group on a usb device.
-  #    HOOKS=(base udev block lvm2 filesystems)
-  #
-  ##   NOTE: If you have /usr on a separate partition, you MUST include the
-  #    usr, fsck and shutdown hooks.
-  <<mkinitcpio-hooks>>
 
-  # COMPRESSION
-  # Use this to compress the initramfs image. By default, zstd compression
-  # is used. Use 'cat' to create an uncompressed image.
-  #COMPRESSION="zstd"
-  #COMPRESSION="gzip"
-  #COMPRESSION="bzip2"
-  #COMPRESSION="lzma"
-  #COMPRESSION="xz"
-  #COMPRESSION="lzop"
-  #COMPRESSION="lz4"
-
-  # COMPRESSION_OPTIONS
-  # Additional options for the compressor
-  #COMPRESSION_OPTIONS=()
-
-#+end_src