diff --git a/wiki/linux/alpine.m4 b/wiki/linux/alpine.m4 index 7c44de1..f531149 100644 --- a/wiki/linux/alpine.m4 +++ b/wiki/linux/alpine.m4 @@ -73,7 +73,7 @@ _passage(`Eunakria on the Alpine Linux Discord server', _program(`setup-hostname') validates a _man(`hostname(5)') before writing to the mounted volume.

-_program(`setup-xorg-base') adds the packages _package_alpine(`xorg-server'), _package(`xf86-input-libinput'), _package(`eudev'), and _package(`mesa'), and then enables the _ref(`#initialization') services for udev. +_program(`setup-xorg-base') adds the packages _package_alpine(`xorg-server'), _package_alpine(`xf86-input-libinput'), _package_alpine(`eudev'), and _package_alpine(`mesa'), and then enables the _ref(`#initialization') services for udev.

_subheader(`postmarketOS') diff --git a/wiki/linux/arch.m4 b/wiki/linux/arch.m4 index fe51507..d87acdb 100644 --- a/wiki/linux/arch.m4 +++ b/wiki/linux/arch.m4 @@ -7,7 +7,7 @@ which has given it a reputation for instability compared to other Linux software _subheader(`AUR')

-You will need _package(`base-devel'). +You will need _package_arch(`base-devel').

_subheader(`Bootstrapping') @@ -16,9 +16,9 @@ See _ref(`#bootstrapping'). Use _man(`pacstrap(8)') on Arch and _man(`basestrap(8)') on Artix.

-Arch's base package is _package(`base'). -Additionally, a kernel such as _package(`linux') or _package(`linux-lts') will be necessary. -The Arch wiki says _package(`linux-firmware') is necessary; it's not on many hardware configurations but it's recommended. +Arch's base package is _package_arch(`base'). +Additionally, a kernel such as _package_arch(`linux') or _package_arch(`linux-lts') will be necessary. +The Arch wiki says _package_arch(`linux-firmware') is necessary; it's not on many hardware configurations but it's recommended. On Artix you also need to select the _ref(`#initialization') system: _package(`66'), _package(`dinit'), _package(`openrc'), _package(`runit'), or _package(`s6-base'). The Artix wiki says the initialization-specific _ref(`#login#logind') package is necessary; it's not but it's recommended.

@@ -68,5 +68,5 @@ _bentr(`_link(`makepkg', `https://wiki.archlinux.org/title/Makepkg') (Arch Wiki) _bentr(`_link(`pacman', `https://gitlab.archlinux.org/pacman/pacman/')/_link(`scripts/makepkg.sh.in', `https://gitlab.archlinux.org/pacman/pacman/-/blob/master/scripts/makepkg.sh.in')') ')

-_man(`makepkg(8)') is a _man(`bash(1)') script provided by _package(`pacman') that provides an interface through which to manage _man(``PKGBUILD'(5)')s. +_man(`makepkg(8)') is a _man(`bash(1)') script provided by _package_arch(`pacman') that provides an interface through which to manage _man(``PKGBUILD'(5)')s.

diff --git a/wiki/linux/audio.m4 b/wiki/linux/audio.m4 index 9df8d29..e5186d8 100644 --- a/wiki/linux/audio.m4 +++ b/wiki/linux/audio.m4 @@ -11,14 +11,14 @@ _bentr(`ALSA lib con _bentr(`ALSA lib pcm_dmix.c:1108:(snd_pcm_dmix_open) unable to open slave') ')

-The Alpine wiki ("Adding sound") says to install _code(`alsa-conf'), _code(`alsa-lib'), and _code(`alsa-utils'), +The Alpine wiki ("Adding sound") says to install _package_alpine(`alsa-conf'), _package_alpine(`alsa-lib'), and _package_alpine(`alsa-utils'), add yourself to the _code(`audio') group, and then do some more configuration that I've never needed to do: Use _man(`alsamixer(1)') to find a working sound card (press _code(`F6') from the first screen ALSAMixer presents) and edit _code(`/usr/share/alsa/alsa.conf') and change _code(`defaults.ctl.card') and _code(`defaults.pcm.card') to the sound card that works.

The Alpine wiki doesn't mention this but you'll need to enable the _code(`alsa') OpenRC service and either start it or reboot. -I also installed _code(`gstreamer') but I don't know why. +I also installed _package_alpine(`gstreamer') but I don't know why.

ALSA is clunky, many people prefer to use a frontend such as Pipewire or PulseAudio that exposes its own interface while remaining compatible with ALSA. @@ -33,7 +33,7 @@ _bentr(`PipeWire (Alpin _bentr(`PipeWire (FreeDesktop Wiki)') ')

-Provided by the _code(`pipewire') package on Alpine. +Provided by the _package_alpine(`pipewire') package on Alpine.

 RTKit error: org.freedesktop.DBus.Error.ServiceUnknown
@@ -43,6 +43,6 @@ This means you need _program(`rtkit') installed and running through your initial
 

_subheader(`PulseAudio')

-On Alpine you'll need the _program(`pulseaudio'), _program(`pulseaudio-alsa'), and _program(`alsa-plugins-pulse') packages for PulseAudio with ALSA compatibility. +On Alpine you'll need the _package_alpine(`pulseaudio'), _package_alpine(`pulseaudio-alsa'), and _package_alpine(`alsa-plugins-pulse') packages for PulseAudio with ALSA compatibility. Start _man(`pulseaudio(1)') when you want audio, ideally in your _file(`.xinitrc').

diff --git a/wiki/linux/bootstrapping.m4 b/wiki/linux/bootstrapping.m4 index 7f9f472..ddf051a 100644 --- a/wiki/linux/bootstrapping.m4 +++ b/wiki/linux/bootstrapping.m4 @@ -20,7 +20,7 @@ the first step will be to connect to the Internet.

Next, if your chosen Linux distribution has a package manager, configure it, use it to initialize the file system on the intended system storage, and install the necessary system packages to the storage. -Usually distributions have a single base package, like _ref(`#arch')'s _package(`base') or _ref(`#alpine')'s _package(`alpine-base'). +Usually distributions have a single base package, like _ref(`#arch')'s _package_arch(`base') or _ref(`#alpine')'s _package_alpine(`alpine-base'). If it doesn't include any of them, install separately a kernel, initialization system, and userland.