diff --git a/conf.d/mixin.mk b/conf.d/mixin.mk index 7c97ccd6..acca1c47 100644 --- a/conf.d/mixin.mk +++ b/conf.d/mixin.mk @@ -83,6 +83,9 @@ mixin/regular-lxqt: use/x11/lxqt use/x11/sddm \ use/browser/falkon use/x11/gtk/nm +nm +plymouth @$(call set,THE_IMAGEWRITER,rosa-imagewriter) +mixin/regular-mate: use/x11/mate use/fonts/ttf/google +nm + @$(call add,LIVE_LISTS,$(call tags,mobile mate)) + # NB: never ever use/syslinux/ui/gfxboot here as gfxboot mangles # kernel cmdline resulting in method:disk instead of method:cdrom # which will change propagator's behaviour to probe additional diff --git a/conf.d/regular.mk b/conf.d/regular.mk index 8416d42f..029d5d25 100644 --- a/conf.d/regular.mk +++ b/conf.d/regular.mk @@ -142,13 +142,10 @@ distro/regular-lxde-sysv: distro/.regular-sysv-gtk mixin/regular-lxde distro/regular-xmonad: distro/.regular-gtk use/x11/xmonad @$(call add,LIVE_PACKAGES,livecd-regular-xmonad) -distro/regular-mate: distro/.regular-gtk +nm \ - use/x11/mate use/fonts/ttf/google use/domain-client - @$(call add,LIVE_LISTS,$(call tags,mobile mate)) +distro/regular-mate: distro/.regular-gtk mixin/regular-mate use/domain-client @$(call add,LIVE_LISTS,$(call tags,base smartcard)) -distro/regular-mate-sysv: distro/.regular-sysv-gtk use/x11/mate +nm - @$(call add,LIVE_LISTS,$(call tags,mobile mate)) +distro/regular-mate-sysv: distro/.regular-sysv-gtk mixin/regular-mate; @: distro/regular-enlightenment: distro/.regular-gtk use/x11/enlightenment; @: