Big refactoring. Add mixin/ximper-desktop-commom-software section.

conf.d/ximper.mk

-# regular build/usage images
 ifeq (distro,$(IMAGE_CLASS))
 
+mixin/ximper-desktop-commom-software:
+	@$(call add,THE_PACKAGES,appinstall gnome-software\
+	\
+	eog eog-plugins\
+	mate-document-viewer mate-document-viewer-djvu mate-document-viewer-dvi mate-document-viewer-pixbuf mate-document-viewer-xps\
+	\
+	blackbox-terminal neofetch btop\
+	\
+	gradience Kvantum\
+	\
+	notification-daemon\
+	\
+	)
+
+
 mixin/ximper-desktop: +alsa +nm-native \
 	use/x11/xorg use/xdg-user-dirs use/l10n \
 	use/branding/notes
@@ -17,6 +31,8 @@ mixin/ximper-desktop: +alsa +nm-native \
 	@$(call add,DEFAULT_SERVICES_ENABLE,alteratord)
 	@$(call add,CONTROL,fusermount:public)
 	@$(call add,CONTROL,libnss-role:disabled)
+	@$(call add,THE_PACKAGES,sudo)
+	@$(call add,CONTROL,sudowheel:enabled)
 
 
 mixin/ximper-x11: use/luks \
@@ -30,21 +46,19 @@ mixin/ximper-x11: use/luks \
 	@$(call add,INSTALL2_PACKAGES,volumes-profile-kdesktop)
 	@$(call set,INSTALL2_FONTS,fonts-otf-abattis-cantarell)
 
+
 mixin/ximper-gnome3: use/x11/gnome3/minimal use/fonts/ttf/redhat +nm-gtk
 	@$(call add,THE_PACKAGES,xcalib templates)
-	@$(call add,THE_PACKAGES,sudo)
-	@$(call add,CONTROL,sudowheel:enabled)
 	@$(call add,THE_PACKAGES,chrome-gnome-shell)
-	@$(call add,THE_PACKAGES,qt5-wayland gnome-terminal-nautilus blackbox-terminal neofetch sushi gradience Kvantum)
-	@$(call add,THE_PACKAGES,appinstall gnome-software)
-	@$(call add,THE_PACKAGES,gnome-shell-extension-appindicator gnome-shell-extension-dash-to-dock gnome-shell-extension-gsconnect\
+	@$(call add,THE_PACKAGES,qt5-wayland qt6-wayland)
+	@$(call add,THE_PACKAGES,gnome-terminal-nautilus sushi gnome-epub-thumbnailer alacarte gnome-power-manager power-profiles-daemon gnome-bluetooth3.0\
+	gnome-shell-extension-appindicator gnome-shell-extension-dash-to-dock gnome-shell-extension-gsconnect\
 	branding-etersoft-ximper-gnome-settings)
-
 ifeq (sisyphus,$(BRANCH))
 	@$(call add,THE_PACKAGES,gnome-packagekit)
 endif
 
-# common ground (really lowlevel)
+
 distro/.ximper-bare: distro/.base use/kernel/net use/docs/license \
 	use/stage2/ata use/stage2/fs use/stage2/hid use/stage2/md \
 	use/stage2/mmc use/stage2/net use/stage2/net-nfs use/stage2/cifs \
@@ -75,6 +89,7 @@ distro/.ximper-x11: distro/.ximper-base mixin/ximper-x11 \
 	@$(call add,LIVE_PACKAGES,gpm)
 	@$(call add,DEFAULT_SERVICES_DISABLE,gpm powertop)
 
+
 distro/.ximper-wm: distro/.ximper-x11 \
 	mixin/ximper-desktop +vmguest \
 	use/live/rw +live-installer
@@ -82,14 +97,14 @@ distro/.ximper-wm: distro/.ximper-x11 \
 	@$(call set,GRUB_DEFAULT,live)
 	@$(call set,SYSLINUX_DEFAULT,live)
 
-# DE base target
-# TODO: use/plymouth/live when luks+plymouth is done, see also #28255
+
 distro/.ximper-desktop: distro/.ximper-wm use/branding/full \
 	use/firmware/laptop +systemd +systemd-optimal
 	@$(call add,THE_PACKAGES,bluez)
 	@$(call add,THE_PACKAGES,btrfs-progs)
 	@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd)
 
+
 distro/.ximper-install: distro/.ximper-base +installer \
 	use/branding use/bootloader/grub use/luks use/stage2/kms \
 	use/install2/fs use/install2/vnc use/install2/repo
@@ -110,25 +125,44 @@ distro/.ximper-install-x11: distro/.ximper-install +vmguest +wireless \
 	@$(call add,RESCUE_LISTS,$(call tags,rescue misc))
 	@$(call add,MAIN_PACKAGES,anacron man-whatis usb-modeswitch)
 
+
 distro/.ximper-install-x11-systemd: distro/.ximper-install-x11 \
 	use/x11/lightdm/gtk +systemd +systemd-optimal
 	@$(call add,THE_PACKAGES,bluez)
 	@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd)
 
-distro/ximper-install: distro/.ximper-install-x11-systemd mixin/ximper-gnome3 \
+
+distro/ximper-install: distro/.ximper-install-x11-systemd mixin/ximper-gnome3 mixin/ximper-desktop-commom-software\
 	use/kernel/latest +plymouth; @:
-	@$(call add,MAIN_GROUPS,etersoft/00_office etersoft/libreoffice-still etersoft/libreoffice-latest \
-	slinux/flatpak slinux/graphics-base slinux/graphics slinux/graphics-full-inkscape slinux/graphics-full-shotwell\
-	 slinux/multimedia-full-audacity etersoft/multimedia-base\
-	 etersoft/multimedia-mpv slinux/multimedia slinux/multimedia-full-shotcut\
-	 etersoft/virt-machines etersoft/virt-manager etersoft/gnome-boxes etersoft/virtualbox\
-	 etersoft/01_games etersoft/games-portproton etersoft/games-lutris etersoft/games-mangohud etersoft/games-32bit-libs etersoft/games-vkbasalt\
-	 etersoft/02_peripheral etersoft/peripherals-openrgb\
-	 etersoft/03_browsers etersoft/browsers-firefox etersoft/browsers-firefox-esr etersoft/browsers-gnome-web etersoft/browsers-newmoon etersoft/browsers-chromium etersoft/browsers-chromium-gost\
-	 etersoft/04_dev-tools etersoft/dev-tools-codium etersoft/dev-tools-etersoft-build-utils etersoft/dev-tools-gnome-ssh-agent\
-	 etersoft/99_timeshift)
-
-distro/ximper: distro/.ximper-desktop mixin/regular-gnome3 \
+	@$(call add,MAIN_GROUPS,slinux/flatpak etersoft/99_timeshift\
+	 slinux/graphics\
+	 slinux/graphics-full-inkscape slinux/graphics-full-shotwell\
+	 \
+	 etersoft/00_office etersoft/libreoffice-still etersoft/libreoffice-latest\
+	 \
+	 slinux/multimedia\
+	 slinux/multimedia-full-audacity etersoft/multimedia-base etersoft/multimedia-mpv\
+	 slinux/multimedia-full-shotcut\
+	 \
+	 etersoft/virt-machines\
+	 etersoft/virt-manager etersoft/gnome-boxes etersoft/virtualbox\
+	 \
+	 etersoft/01_games\
+	 etersoft/games-portproton etersoft/games-lutris etersoft/games-mangohud\
+	 etersoft/games-32bit-libs etersoft/games-vkbasalt\
+	 \
+	 etersoft/02_peripheral\
+	 etersoft/peripherals-openrgb\
+	 \
+	 etersoft/03_browsers etersoft/browsers-firefox etersoft/browsers-firefox-esr etersoft/browsers-gnome-web\
+	 etersoft/browsers-newmoon etersoft/browsers-chromium etersoft/browsers-chromium-gost\
+	 \
+	 etersoft/04_dev-tools etersoft/dev-tools-codium etersoft/dev-tools-etersoft-build-utils\
+	 etersoft/dev-tools-gnome-ssh-agent\
+	 )
+
+
+distro/ximper: distro/.ximper-desktop mixin/ximper-gnome3 \
 	use/kernel/latest +plymouth
 	@$(call add,LIVE_PACKAGES,livecd-gnome3-setup-done)
 	@$(call add,LIVE_PACKAGES,gnome-flashback screenpen)