small rework

conf.d/ximper.mk

@@ -4,7 +4,7 @@ ifeq (distro,$(IMAGE_CLASS))
 # Lists - pkg.in/lists/etersoft/*
 # Groups - pkg.in/groups/etersoft/*
 mixin/ximper-desktop-common-software:
-	@$(call add,THE_LISTS,etersoft/_base-apps)
+	@$(call add,THE_PACKAGES,ximper-metapackage-base)
 	@$(call add,MAIN_GROUPS,\
 	 \
 	 etersoft/gnome-a11y\
@@ -42,7 +42,6 @@ mixin/ximper-desktop-common-software:
 	 etersoft/z01_gparted\
 	 )
 	@$(call add,LIVE_LISTS,\
-	 etersoft/gnome-settings\
 	 etersoft/yandex-browser-stable etersoft/libreoffice etersoft/atril\
 	 etersoft/portproton etersoft/telegram etersoft/gnome-ssh-agent\
 	 slinux/graphics-full-shotwell slinux/flatpak etersoft/timeshift\
@@ -88,11 +87,11 @@ mixin/ximper-gnome: use/x11/xorg \
 	use/fonts/ttf/google-noto \
 	+nm-gtk \
 	+pipewire
+	@$(call add,THE_PACKAGES,ximper-metapackage-base-gnome ximper-metapackage-base-gnome-apps)
 	@$(call add,THE_PACKAGES,gdm-settings)
-	@$(call add,THE_LISTS,etersoft/_gnome-base) # pkg.in/lists/etersoft/_gnome-base
+	@$(call add,LIVE_LISTS,etersoft/gnome-settings)
 	@$(call add,SERVICES_ENABLE,switcheroo-control.service) # Service to check dual-GPU. Q: Maybe to post script if present?
 	@$(call add,IM_PACKAGES,imsettings-gsettings)
-	@$(call add,LIVE_PACKAGES,installer-feature-online-repo)
 
 
 distro/.ximper-bare: distro/.base \
@@ -151,6 +150,7 @@ distro/.ximper-install-x11: distro/.ximper-install +vmguest +wireless \
 	use/branding/complete use/branding/slideshow/once mixin/desktop-installer \
 	use/efi/shell use/l10n/default/ru_RU
 	@$(call add,LIVE_PACKAGES,installer-feature-fstrim-stage2)
+	@$(call add,LIVE_PACKAGES,installer-feature-online-repo)
 	@$(call set,INSTALLER,ximper)
 	@$(call add,MAIN_PACKAGES,anacron man-whatis usb-modeswitch)
 

pkg.in/lists/etersoft/_base-apps

-ximper-metapackage-base

pkg.in/lists/etersoft/_gnome-base

-ximper-metapackage-base-gnome
-ximper-metapackage-base-gnome-apps
-