Split up images

mkosi.conf

@@ -3,64 +3,6 @@ Distribution=arch
 Architecture=x86-64
 CacheOnly=true
 
-[Output]
-Format=disk
-SplitArtifacts=true
-ManifestFormat=json,changelog
-ImageId=rafeOS
-SectorSize=4096
-#CompressOutput=xz
-# For Reproducible Builds
-Seed=834dd70f55be43cc9934b20fc0b7f7be
-
-[Content]
-Bootable=yes
-SourceDateEpoch=0
-Packages=
-	# Minimal package set to define a basic Arch Linux installation
-	base
-	# system and service manager
-	systemd
-	# systemd: show QR codes
-	qrencode
-	# systemd: unlocking LUKS2 volumes with FIDO2 token
-	libfido2
-	# systemd: unlocking LUKS2 volumes with TPM2
-	tpm2-tss
-	# The Linux kernel and modules
-	linux
-	# linux: firmware images needed for some devices
-	linux-firmware
-	# linux: to set the correct wireless channels of your country
-	wireless-regdb
-	# Microcode update image for AMD CPUs
-	amd-ucode
-	# Microcode update image for Intel CPUs
-	intel-ucode
-	# Userspace utilities for linux-erofs file system
-	erofs-utils
-	# Btrfs filesystem utilities
-	btrfs-progs
-	# Ext2/3/4 filesystem utilities
-	e2fsprogs
-
-RemoveFiles=
-    /usr/include
-    /usr/local
-    /usr/src
-    /usr/lib/cmake
-    /usr/lib/pkgconfig
-
-KernelCommandLine=
-	# Output fewer messages during boot. Errors will not be suppressed.
-	quiet
-	# prevents access to a shell if boot fails
-	rd.shell=0
-	# prevents access to a shell if the root is corrupt
-	rd.emergency=reboot
-	# reboots system 30 seconds after a kernel panic
-	panic=30
-
 [Validation]
 SecureBoot=true
 SecureBootKey=mkosi.key

mkosi.conf.d/90-remove-files.conf

@@ -0,0 +1,7 @@
+[Content]
+RemoveFiles=
+    /usr/include
+    /usr/local
+    /usr/src
+    /usr/lib/cmake
+    /usr/lib/pkgconfig

mkosi.images/base/mkosi.conf

@@ -0,0 +1,34 @@
+[Output]
+Format=directory
+
+[Content]
+Bootable=no
+CleanPackageMetadata=no
+
+Packages=
+	# Minimal package set to define a basic Arch Linux installation
+	base
+	# system and service manager
+	systemd
+	# systemd: show QR codes
+	qrencode
+	# systemd: unlocking LUKS2 volumes with FIDO2 token
+	libfido2
+	# systemd: unlocking LUKS2 volumes with TPM2
+	tpm2-tss
+	# The Linux kernel and modules
+	linux
+	# linux: firmware images needed for some devices
+	linux-firmware
+	# linux: to set the correct wireless channels of your country
+	wireless-regdb
+	# Microcode update image for AMD CPUs
+	amd-ucode
+	# Microcode update image for Intel CPUs
+	intel-ucode
+	# Userspace utilities for linux-erofs file system
+	erofs-utils
+	# Btrfs filesystem utilities
+	btrfs-progs
+	# Ext2/3/4 filesystem utilities
+	e2fsprogs

mkosi.images/server/mkosi.conf

@@ -0,0 +1,29 @@
+[Config]
+Dependencies=base
+
+[Output]
+Format=disk
+Output=rafeOS-server
+ManifestFormat=json,changelog
+ImageId=rafeOS
+SectorSize=4096
+CompressOutput=xz
+# For Reproducible Builds
+Seed=834dd70f55be43cc9934b20fc0b7f7be
+
+[Content]
+Bootable=yes
+SourceDateEpoch=0
+BaseTrees=../../mkosi.output/base/
+Packages=
+	docker
+
+KernelCommandLine=
+	# Output fewer messages during boot. Errors will not be suppressed.
+	quiet
+	# prevents access to a shell if boot fails
+	rd.shell=0
+	# prevents access to a shell if the root is corrupt
+	rd.emergency=reboot
+	# reboots system 30 seconds after a kernel panic
+	panic=30

mkosi.images/server/mkosi.postinst.chroot

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+echo "VARIANT_ID=server" >> /etc/os-release

mkosi.images/workstation/mkosi.conf

@@ -0,0 +1,31 @@
+[Config]
+Dependencies=base
+
+[Output]
+Format=disk
+Output=rafeOS-workstation
+ManifestFormat=json,changelog
+ImageId=rafeOS
+SectorSize=4096
+CompressOutput=xz
+# For Reproducible Builds
+Seed=834dd70f55be43cc9934b20fc0b7f7be
+
+[Content]
+Bootable=yes
+SourceDateEpoch=0
+BaseTrees=../../mkosi.output/base/
+Packages=
+	gnome
+	gdm
+	pipewire
+
+KernelCommandLine=
+	# Output fewer messages during boot. Errors will not be suppressed.
+	quiet
+	# prevents access to a shell if boot fails
+	rd.shell=0
+	# prevents access to a shell if the root is corrupt
+	rd.emergency=reboot
+	# reboots system 30 seconds after a kernel panic
+	panic=30

mkosi.images/workstation/mkosi.postinst.chroot

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+echo "VARIANT_ID=workstation" >> /etc/os-release

mkosi.repart/10-usr.conf

@@ -1,6 +1,6 @@
 [Partition]
 Type=usr
-Label=%M_%A
+Label=%M-%W_%A
 SizeMinBytes=3G
 SizeMaxBytes=3G
 Minimize=best

mkosi.repart/11-usr-verity.conf

@@ -1,6 +1,6 @@
 [Partition]
 Type=usr-verity
-Label=%M_%A
+Label=%M-%W_%A
 SizeMinBytes=256M
 SizeMaxBytes=256M
 Minimize=best

mkosi.repart/12-usr-verity-sig.conf

@@ -1,5 +1,5 @@
 [Partition]
 Type=usr-verity-sig
-Label=%M_%A
+Label=%M-%W_%A
 Verity=signature
 VerityMatchKey=usr