move GROUPS to mixin/ximper-desktop-commom-software

conf.d/ximper.mk

@@ -22,6 +22,44 @@ mixin/ximper-desktop-commom-software:
 	orca\
 	\
 	cups-pk-helper\
+	\
+	file-roller\
+	\
+	)
+	@$(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 etersoft/office-atril\
+	 \
+	 slinux/multimedia\
+	 slinux/multimedia-full-audacity etersoft/multimedia-base etersoft/multimedia-mpv\
+	 slinux/multimedia-full-shotcut etersoft/multimedia-full-obs-studio\
+	 \
+	 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/games-steam\
+	 \
+	 etersoft/02_peripheral\
+	 etersoft/peripherals-openrgb\
+	 \
+	 etersoft/03_browsers etersoft/browsers-firefox etersoft/browsers-firefox-esr etersoft/browsers-gnome-web\
+	 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/05_messengers\
+	 etersoft/messengers-telegram etersoft/messengers-whatsapp\
+	 )
+	@$(call add,LIVE_GROUPS,\
+	 etersoft/chromium etersoft/libreoffice etersoft/atril\
+	 etersoft/portproton etersoft/telegram etersoft/32bit-libs etersoft/gnome-ssh-agent\
+	 slinux/graphics-full-shotwell slinux/flatpak\
 	 )
 
 
@@ -137,35 +175,6 @@ distro/.ximper-install-x11-systemd: distro/.ximper-install-x11 \
 
 distro/ximper: distro/.ximper-install-x11-systemd distro/.ximper-wm mixin/ximper-gnome mixin/ximper-desktop-commom-software\
 	use/kernel/latest +plymouth; @:
-	@$(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 etersoft/office-atril\
-	 \
-	 slinux/multimedia\
-	 slinux/multimedia-full-audacity etersoft/multimedia-base etersoft/multimedia-mpv\
-	 slinux/multimedia-full-shotcut etersoft/multimedia-full-obs-studio\
-	 \
-	 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/games-steam\
-	 \
-	 etersoft/02_peripheral\
-	 etersoft/peripherals-openrgb\
-	 \
-	 etersoft/03_browsers etersoft/browsers-firefox etersoft/browsers-firefox-esr etersoft/browsers-gnome-web\
-	 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/05_messengers\
-	 etersoft/messengers-telegram etersoft/messengers-whatsapp\
-	 )
 	@$(call set,META_VOL_ID,Ximper Linux $(DISTRO_VERSION) $(ARCH))
 	@$(call set,META_APP_ID,Ximper Linux $(DISTRO_VERSION) $(ARCH) $(shell date +%F))
 	@$(call set,BRANDING,etersoft-ximper)