mixin.mk, regular.mk: luks and volumes features for distro target only

conf.d/mixin.mk

@@ -38,7 +38,7 @@ mixin/e2k-mate: use/e2k/x11 use/x11/xorg use/fonts/install2 \
 	@$(call add,THE_PACKAGES,zsh bash-completion)
 
 ### regular.mk
-mixin/regular-x11: use/luks use/volumes/regular \
+mixin/regular-x11: \
 	use/browser/firefox use/kernel/disable-usb-autosuspend \
 	use/branding use/ntp/chrony use/services/lvm2-disable
 	@$(call add,THE_LISTS,$(call tags,(base || desktop) && regular && !extra))

conf.d/regular.mk

@@ -14,7 +14,8 @@ distro/.regular-bare: distro/.base use/kernel/net use/docs/license \
 
 # base target (for most images)
 distro/.regular-base: distro/.regular-bare use/vmguest use/memtest \
-	use/efi/shell use/efi/dtb +efi; @:
+	use/efi/shell use/efi/dtb +efi \
+	use/luks use/volumes/regular; @:
 ifeq (,$(filter-out p10,$(BRANCH)))
 ifeq (,$(filter-out x86_64 aarch64,$(ARCH)))
 	@$(call set,KFLAVOURS,un-def)