refactoring

conf.d/ximper.mk

@@ -3,53 +3,100 @@ ifeq (distro,$(IMAGE_CLASS))
 # Basic applications and User selection lists
 # Lists - pkg.in/lists/etersoft/*
 # Groups - pkg.in/groups/etersoft/*
-mixin/ximper-desktop-common-software:
-	@$(call add,THE_LISTS,etersoft/meta-base)
+mixin/ximper-desktop-base-software:
+	@$(call add,THE_LISTS,etersoft/meta/base)
 	@$(call add,MAIN_GROUPS,\
 	 \
-	 slinux/flatpak etersoft/z99_timeshift\
-	 slinux/graphics\
-	 slinux/graphics-full-inkscape slinux/graphics-full-shotwell etersoft/graphics-krita etersoft/graphics-blender\
+	 etersoft/groups/00_settings\
+	 etersoft/base/settings/base\
+	 etersoft/base/settings/flatpak\
 	 \
-	 etersoft/00_office etersoft/libreoffice-still etersoft/libreoffice-latest etersoft/office-atril\
-	 etersoft/office-fragments\
+	 etersoft/groups/01_accessibility\
 	 \
-	 slinux/multimedia\
-	 slinux/multimedia-full-audacity etersoft/multimedia-amberol etersoft/multimedia-mpv\
-	 slinux/multimedia-full-shotcut etersoft/multimedia-full-obs-studio\
-	 etersoft/multimedia-cassette etersoft/multimedia-showtime\
+	 etersoft/groups/01_peripheral\
+	 etersoft/base/peripheral/asusctl-rog-gui\
+	 etersoft/base/peripheral/openrgb\
+	 etersoft/base/peripheral/printers\
+	 etersoft/base/peripheral/scanners\
 	 \
-	 etersoft/virt-machines\
-	 etersoft/virt-manager etersoft/gnome-boxes etersoft/virtualbox\
+	 etersoft/groups/01_system-management\
+	 etersoft/base/system-management/gparted\
+	 etersoft/base/system-management/timeshift\
 	 \
-	 etersoft/00_settings\
-	 etersoft/settings-base\
+	 etersoft/groups/02_browsers\
+	 etersoft/base/browsers/chromium-gost\
+	 etersoft/base/browsers/firefox-esr\
+	 etersoft/base/browsers/firefox\
+	 etersoft/base/browsers/gnome-web\
+	 etersoft/base/browsers/yandex-browser-stable\
 	 \
-	 etersoft/01_games\
-	 etersoft/games-portproton etersoft/games-lutris etersoft/games-mangohud\
-	 etersoft/games-vkbasalt etersoft/games-steam\
+	 etersoft/groups/02_games\
+	 etersoft/base/games/lutris\
+	 etersoft/base/games/mangohud\
+	 etersoft/base/games/portproton\
+	 etersoft/base/games/steam\
+	 etersoft/base/games/vkbasalt\
 	 \
-	 etersoft/02_peripheral\
-	 etersoft/peripherals-openrgb etersoft/peripherals-asusctl-rog-gui\
-	 etersoft/peripherals-simple-scan\
+	 etersoft/groups/02_messengers\
+	 etersoft/base/messengers/telegram etersoft/base/messengers/whatsapp\
 	 \
-	 etersoft/03_browsers etersoft/browsers-firefox etersoft/browsers-firefox-esr etersoft/browsers-gnome-web\
-	 etersoft/browsers-chromium-gost etersoft/browsers-yandex-browser-stable\
+	 etersoft/groups/03_office\
+	 etersoft/base/office/atril\
+	 etersoft/base/office/fragments\
+	 etersoft/base/office/libreoffice-latest\
+	 etersoft/base/office/libreoffice-still\
 	 \
-	 etersoft/04_dev-tools etersoft/dev-tools-codium etersoft/dev-tools-etersoft-build-utils\
-	 etersoft/dev-tools-gnome-ssh-agent etersoft/dev-tools-geany\
+	 slinux/multimedia\
+	 etersoft/base/multimedia/amberol\
+	 etersoft/base/multimedia/cassette\
+	 etersoft/base/multimedia/clapper\
+	 etersoft/base/multimedia/full-obs-studio\
+	 etersoft/base/multimedia/mpv\
+	 slinux/multimedia-full-audacity\
+	 slinux/multimedia-full-shotcut\
 	 \
-	 etersoft/05_messengers\
-	 etersoft/messengers-telegram etersoft/messengers-whatsapp\
-	 etersoft/z01_gparted\
+	 slinux/graphics\
+	 etersoft/base/graphics/blender\
+	 etersoft/base/graphics/krita\
+	 slinux/graphics-full-inkscape\
+	 slinux/graphics-full-shotwell\
+	 \
+	 etersoft/groups/04_dev-tools\
+	 etersoft/base/dev-tools/codium\
+	 etersoft/base/dev-tools/etersoft-build-utils\
+	 etersoft/base/dev-tools/geany\
+	 \
+	 etersoft/groups/04_virt-machines\
+	 etersoft/base/virt-machines/gnome-boxes\
+	 etersoft/base/virt-machines/virt-manager\
+	 etersoft/base/virt-machines/virtualbox\
 	)
 	@$(call add,LIVE_LISTS,\
-	 etersoft/yandex-browser-stable etersoft/libreoffice etersoft/atril\
-	 etersoft/portproton etersoft/telegram etersoft/gnome-ssh-agent\
-	 slinux/graphics-full-shotwell slinux/flatpak etersoft/timeshift\
-	 etersoft/gparted\
+	 etersoft/base/browsers/yandex-browser-stable\
+	 etersoft/base/office/libreoffice-still\
+	 etersoft/base/office/atril\
+	 etersoft/base/messengers/telegram\
+	 slinux/graphics-full-shotwell\
+	 etersoft/base/system-management/timeshift\
+	 etersoft/base/system-management/gparted\
+	 slinux/flatpak\
 	 )
 
+mixin/ximper-desktop-gnome-software:
+	@$(call add,MAIN_GROUPS,\
+	 etersoft/gnome/accessibility/gnome-a11y\
+	 etersoft/gnome/settings/base\
+	 etersoft/gnome/dev-tools/gnome-ssh-agent\
+	)
+	@$(call add,LIVE_LISTS,etersoft/gnome/settings/base)
+	@$(call add,THE_LISTS,etersoft/meta/base-gnome)
+
+mixin/ximper-desktop-hyprland-software:
+	@$(call add,MAIN_GROUPS,\
+	 etersoft/hyprland/settings/base\
+	)
+	@$(call add,LIVE_LISTS,etersoft/hyprland/settings/base)
+	@$(call add,THE_LISTS,etersoft/meta/base-hyprland)
 
 mixin/ximper-desktop: +alsa +nm-native \
 	use/x11/xorg use/xdg-user-dirs use/l10n \
@@ -71,7 +118,6 @@ mixin/ximper-desktop: +alsa +nm-native \
 	@$(call add,THE_PACKAGES,sudo)
 	@$(call add,CONTROL,sudowheel:enabled)
 
-
 mixin/ximper-x11: use/luks \
 	use/kernel/disable-usb-autosuspend \
 	use/branding use/ntp/chrony use/services/lvm2-disable
@@ -89,11 +135,8 @@ mixin/ximper-gnome: use/x11/xorg \
 	+nm-gtk \
 	+nm-gtk4 \
 	+pipewire
-	@$(call add,MAIN_GROUPS,etersoft/gnome-a11y etersoft/settings-gnome)
-	@$(call add,THE_LISTS,etersoft/meta-base-gnome)
 	@$(call add,LIVE_PACKAGES,gnome-flashback)
 	@$(call add,THE_PACKAGES,gdm-settings)
-	@$(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,THE_PACKAGES,gnome-console)
@@ -101,7 +144,7 @@ mixin/ximper-gnome: use/x11/xorg \
 
 mixin/ximper-wm: use/x11/xorg \
 	+nm-gtk
-	@$(call add,THE_LISTS,etersoft/meta-base-wm)
+	@$(call add,THE_LISTS,etersoft/meta/base-wm)
 	@$(call add,SERVICES_ENABLE,switcheroo-control.service)
 	@$(call add,IM_PACKAGES,imsettings-gsettings)
 	@$(call add,THE_PACKAGES,xorg-xwayland)
@@ -110,9 +153,6 @@ mixin/ximper-wm: use/x11/xorg \
 
 mixin/ximper-hyprland: use/x11/sddm \
 	+pipewire
-	@$(call add,MAIN_GROUPS,etersoft/settings-hyprland)
-	@$(call add,THE_LISTS,etersoft/meta-base-hyprland)
-	@$(call add,LIVE_LISTS,etersoft/hyprland-settings)
 
 distro/.ximper-bare: distro/.base \
 	use/kernel/laptop use/kernel/net use/kernel/wireless \
@@ -174,7 +214,6 @@ distro/.ximper-install-x11: distro/.ximper-install +vmguest +wireless \
 	@$(call set,INSTALLER,ximper)
 	@$(call add,MAIN_PACKAGES,anacron man-whatis usb-modeswitch)
 
-
 distro/.ximper-install-x11-systemd: distro/.ximper-install-x11 +systemd +systemd-optimal
 	@$(call add,THE_PACKAGES,bluez)
 	@$(call add,THE_PACKAGES,btrfs-progs)
@@ -183,7 +222,7 @@ distro/.ximper-install-x11-systemd: distro/.ximper-install-x11 +systemd +systemd
 distro/.ximper-base: distro/.ximper-install-x11-systemd \
 	use/live/rw use/live/ru use/live/x11 use/live/repo \
 	use/live/suspend \
-	mixin/ximper-desktop-common-software \
+	mixin/ximper-desktop-base-software \
 	use/fonts/ttf/redhat \
 	use/fonts/ttf/google-noto \
 	use/kernel/latest \
@@ -204,6 +243,7 @@ distro/.ximper-base: distro/.ximper-install-x11-systemd \
 # Remove nouveau as not needed
 # Add install scripts of Nvidia and all releated things out of box
 mixin/ximper-nvidia: use/x11/nvidia use/stage2/kms/nvidia
+	@$(call add,MAIN_GROUPS,etersoft/base/system-management/nvidia)
 	@$(call add,LIVE_PACKAGES,installer-feature-nvidia)
 	@$(call add,LIVE_PACKAGES,apt-scripts-nvidia)
 	@$(call add,CLEANUP_PACKAGES,'^kernel-modules-drm-nouveau.*')
@@ -214,32 +254,37 @@ mixin/ximper-nvidia: use/x11/nvidia use/stage2/kms/nvidia
 	libnvidia-ptxjitcompiler libnvoptix nvidia-smi ocl-nvidia)
 	@$(call add,SERVICES_ENABLE,nvidia-suspend.service nvidia-resume.service nvidia-hibernate.service)
 
-
+mixin/ximper-standard:
+	@$(call add,MAIN_GROUPS,\
+	 etersoft/base/games/32bit-libs\
+	 etersoft/base/system-management/amd\
+	)
+	@$(call add,LIVE_LISTS,etersoft/base/games/32bit-libs)
 
 distro/ximper-gnome: distro/.ximper-base \
-	mixin/ximper-gnome
-	@$(call add,MAIN_GROUPS,etersoft/games-32bit-libs)
-	@$(call add,LIVE_LISTS,etersoft/32bit-libs)
+	mixin/ximper-standard \
+	mixin/ximper-gnome \
+	mixin/ximper-desktop-gnome-software
 
 distro/ximper-gnome-nvidia: distro/.ximper-base \
-	mixin/ximper-gnome \
 	mixin/ximper-nvidia
+	mixin/ximper-gnome \
+	mixin/ximper-desktop-gnome-software
 
 distro/ximper-hyprland: distro/.ximper-base \
+	mixin/ximper-standard \
+	mixin/ximper-wm \
 	mixin/ximper-hyprland \
-	mixin/ximper-wm
-	@$(call add,MAIN_GROUPS,etersoft/games-32bit-libs)
-	@$(call add,LIVE_LISTS,etersoft/32bit-libs)
+	mixin/ximper-desktop-hyprland-software
 
 distro/ximper-hyprland-nvidia: distro/.ximper-base \
-	mixin/ximper-hyprland \
-	mixin/ximper-wm \
 	mixin/ximper-nvidia
-
+	mixin/ximper-wm \
+	mixin/ximper-hyprland \
+	mixin/ximper-desktop-hyprland-software
 endif
 
 # Fonts mixins
-
 use/fonts/ttf/google-noto: use/fonts
 	@$(call add,FONTS,fonts-ttf-google-noto-sans)
 	@$(call add,FONTS,fonts-ttf-google-noto-serif)

pkg.in/groups/etersoft/browsers-chromium-gost.directory → pkg.in/groups/etersoft/base/browsers/chromium-gost.directory

@@ -3,7 +3,7 @@ Encoding=UTF-8
 Type=Directory
 Name=Chromium gost
 X-Alterator-Required=no
-X-Alterator-Parent=etersoft/03_browsers
-X-Alterator-PackageList=etersoft/chromium-gost
+X-Alterator-Parent=etersoft/groups/02_browsers
+X-Alterator-PackageList=etersoft/base/browsers/chromium-gost
 Categories=Networking
 Name[ru_RU]=Chromium ГОСТ (с поддержкой криптографических алгоритмов ГОСТ)

pkg.in/groups/etersoft/browsers-firefox-esr.directory → pkg.in/groups/etersoft/base/browsers/firefox-esr.directory

@@ -3,7 +3,7 @@ Encoding=UTF-8
 Type=Directory
 Name=Firefox ESR
 X-Alterator-Required=no
-X-Alterator-Parent=etersoft/03_browsers
-X-Alterator-PackageList=etersoft/firefox-esr
-X-Alterator-Conflicts=etersoft/firefox
+X-Alterator-Parent=etersoft/groups/02_browsers
+X-Alterator-PackageList=etersoft/base/browsers/firefox-esr
+X-Alterator-Conflicts=etersoft/base/browsers/firefox
 Categories=Networking
\ No newline at end of file

pkg.in/groups/etersoft/browsers-firefox.directory → pkg.in/groups/etersoft/base/browsers/firefox.directory

@@ -3,7 +3,7 @@ Encoding=UTF-8
 Type=Directory
 Name=Firefox
 X-Alterator-Required=no
-X-Alterator-Parent=etersoft/03_browsers
-X-Alterator-PackageList=etersoft/firefox
-X-Alterator-Conflicts=etersoft/firefox-esr
+X-Alterator-Parent=etersoft/groups/02_browsers
+X-Alterator-PackageList=etersoft/base/browsers/firefox
+X-Alterator-Conflicts=etersoft/base/browsers/firefox-esr
 Categories=Networking
\ No newline at end of file

pkg.in/groups/etersoft/browsers-gnome-web.directory → pkg.in/groups/etersoft/base/browsers/gnome-web.directory

@@ -3,6 +3,6 @@ Encoding=UTF-8
 Type=Directory
 Name=GNOME Web
 X-Alterator-Required=no
-X-Alterator-Parent=etersoft/03_browsers
-X-Alterator-PackageList=etersoft/gnome-web
+X-Alterator-Parent=etersoft/groups/02_browsers
+X-Alterator-PackageList=etersoft/base/browsers/gnome-web
 Categories=Networking
\ No newline at end of file

pkg.in/groups/etersoft/browsers-yandex-browser-stable.directory → pkg.in/groups/etersoft/base/browsers/yandex-browser-stable.directory

@@ -4,6 +4,6 @@ Type=Directory
 Name=Yandex browser
 Name[ru_RU]=Яндекс браузер
 X-Alterator-Required=yes
-X-Alterator-Parent=etersoft/03_browsers
-X-Alterator-PackageList=etersoft/yandex-browser-stable
+X-Alterator-Parent=etersoft/groups/02_browsers
+X-Alterator-PackageList=etersoft/base/browsers/yandex-browser-stable
 Categories=Networking

pkg.in/groups/etersoft/dev-tools-codium.directory → pkg.in/groups/etersoft/base/dev-tools/codium.directory

@@ -3,7 +3,7 @@ Encoding=UTF-8
 Type=Directory
 Name=VSCodium (Open source analogue of Visual Studio Code)
 X-Alterator-Required=no
-X-Alterator-Parent=etersoft/04_dev-tools
-X-Alterator-PackageList=etersoft/codium
+X-Alterator-Parent=etersoft/groups/04_dev-tools
+X-Alterator-PackageList=etersoft/base/dev-tools/codium
 Name[ru_RU]=VSCodium (Свободный аналог Visual Studio Code)
 Categories=Development

pkg.in/groups/etersoft/dev-tools-etersoft-build-utils.directory → pkg.in/groups/etersoft/base/dev-tools/etersoft-build-utils.directory

@@ -3,7 +3,7 @@ Encoding=UTF-8
 Type=Directory
 Name=Etersoft build utils (Set of rpm build utilities from Etersoft)
 X-Alterator-Required=no
-X-Alterator-Parent=etersoft/04_dev-tools
-X-Alterator-PackageList=etersoft/etersoft-build-utils
+X-Alterator-Parent=etersoft/groups/04_dev-tools
+X-Alterator-PackageList=etersoft/base/dev-tools/etersoft-build-utils
 Name[ru_RU]=Etersoft build utils (Набор утилит для упрощения сборки rpm от Etersoft)
 Categories=Development

pkg.in/groups/etersoft/dev-tools-geany.directory → pkg.in/groups/etersoft/base/dev-tools/geany.directory

@@ -3,7 +3,7 @@ Encoding=UTF-8
 Type=Directory
 Name=Geany (Small and lightweight integrated development environment)
 X-Alterator-Required=no
-X-Alterator-Parent=etersoft/04_dev-tools
-X-Alterator-PackageList=etersoft/geany
+X-Alterator-Parent=etersoft/groups/04_dev-tools
+X-Alterator-PackageList=etersoft/base/dev-tools/geany
 Name[ru_RU]=Geany (Маленькая и легкая интегрированная среда разработки)
 Categories=Development

pkg.in/groups/etersoft/games-32bit-libs.directory → pkg.in/groups/etersoft/base/games/32bit-libs.directory

@@ -3,7 +3,7 @@ Encoding=UTF-8
 Type=Directory
 Name=32 bit libraries (For running 32 bit games and programs)
 X-Alterator-Required=yes
-X-Alterator-Parent=etersoft/01_games
-X-Alterator-PackageList=etersoft/32bit-libs
+X-Alterator-Parent=etersoft/groups/02_games
+X-Alterator-PackageList=etersoft/base/games/32bit-libs
 Name[ru_RU]=32 битные библиотеки (Для работы 32 битных игр и программ)
 Categories=Games

pkg.in/groups/etersoft/games-lutris.directory → pkg.in/groups/etersoft/base/games/lutris.directory

@@ -3,7 +3,7 @@ Encoding=UTF-8
 Type=Directory
 Name=Lutris (service providing automated, customized scripts for installing games)
 X-Alterator-Required=no
-X-Alterator-Parent=etersoft/01_games
-X-Alterator-PackageList=etersoft/lutris
+X-Alterator-Parent=etersoft/groups/02_games
+X-Alterator-PackageList=etersoft/base/games/lutris
 Name[ru_RU]=Lutris (Сервис, предоставляющий автоматизированные, настроенные скрипты для установки игр)
 Categories=Games

pkg.in/groups/etersoft/games-mangohud.directory → pkg.in/groups/etersoft/base/games/mangohud.directory

@@ -3,7 +3,7 @@ Encoding=UTF-8
 Type=Directory
 Name=Mangohud (Utility for monitoring FPS, temperature, CPU/GPU load and other information)
 X-Alterator-Required=yes
-X-Alterator-Parent=etersoft/01_games
-X-Alterator-PackageList=etersoft/mangohud
+X-Alterator-Parent=etersoft/groups/02_games
+X-Alterator-PackageList=etersoft/base/games/mangohud
 Name[ru_RU]=Mangohud (Утилита для мониторинга FPS, температуры, загрузки CPU/GPU и другой информации)
 Categories=Games

pkg.in/groups/etersoft/games-portproton.directory → pkg.in/groups/etersoft/base/games/portproton.directory

@@ -3,7 +3,7 @@ Encoding=UTF-8
 Type=Directory
 Name=PortProton (application for installing and running Windows games and programs under Linux, simple for a beginner and powerful for an advanced user)
 X-Alterator-Required=yes
-X-Alterator-Parent=etersoft/01_games
-X-Alterator-PackageList=etersoft/portproton
+X-Alterator-Parent=etersoft/groups/02_games
+X-Alterator-PackageList=etersoft/base/games/portproton
 Name[ru_RU]=PortProton (Приложение для установки и запуска Windows игр и программ под Linux, простое для новичка и мощное для опытного пользователя)
 Categories=Games

pkg.in/groups/etersoft/games-steam.directory → pkg.in/groups/etersoft/base/games/steam.directory

@@ -3,7 +3,7 @@ Encoding=UTF-8
 Type=Directory
 Name=Steam
 X-Alterator-Required=yes
-X-Alterator-Parent=etersoft/01_games
-X-Alterator-PackageList=etersoft/steam
+X-Alterator-Parent=etersoft/groups/02_games
+X-Alterator-PackageList=etersoft/base/games/steam
 Name[ru_RU]=Steam
 Categories=Games

pkg.in/groups/etersoft/games-vkbasalt.directory → pkg.in/groups/etersoft/base/games/vkbasalt.directory

@@ -3,7 +3,7 @@ Encoding=UTF-8
 Type=Directory
 Name=VKBasalt (Linux analogue of ReShade)
 X-Alterator-Required=no
-X-Alterator-Parent=etersoft/01_games
-X-Alterator-PackageList=etersoft/vkbasalt
+X-Alterator-Parent=etersoft/groups/02_games
+X-Alterator-PackageList=etersoft/base/games/vkbasalt
 Name[ru_RU]=VKBasalt (Аналог ReShade для Linux)
 Categories=Utilities

pkg.in/groups/etersoft/graphics-blender.directory → pkg.in/groups/etersoft/base/graphics/blender.directory

@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Type=Directory
 Name=Blender
-X-Alterator-PackageList=etersoft/blender
+X-Alterator-PackageList=etersoft/base/graphics/blender
 X-Alterator-Required=no
 X-Alterator-Parent=slinux/graphics
 Name[ru_RU]=Blender (3D editor)

pkg.in/groups/etersoft/graphics-krita.directory → pkg.in/groups/etersoft/base/graphics/krita.directory

@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Type=Directory
 Name=Krita (Professional FREE and open source painting program)
-X-Alterator-PackageList=etersoft/krita
+X-Alterator-PackageList=etersoft/base/graphics/krita
 X-Alterator-Required=no
 X-Alterator-Parent=slinux/graphics
 Name[ru_RU]=Krita (Профессиональная программа для рисования с открытым исходным кодом)

pkg.in/groups/etersoft/messengers-telegram.directory → pkg.in/groups/etersoft/base/messengers/telegram.directory

@@ -3,6 +3,6 @@ Encoding=UTF-8
 Type=Directory
 Name=Telegram
 Name[ru_RU]=Telegram
-X-Alterator-PackageList=etersoft/telegram
+X-Alterator-PackageList=etersoft/base/messengers/telegram
 X-Alterator-Required=yes
-X-Alterator-Parent=etersoft/05_messengers
\ No newline at end of file
+X-Alterator-Parent=etersoft/groups/02_messengers

pkg.in/groups/etersoft/messengers-whatsapp.directory → pkg.in/groups/etersoft/base/messengers/whatsapp.directory

@@ -3,6 +3,6 @@ Encoding=UTF-8
 Type=Directory
 Name=WhatsApp (Open source client)
 Name[ru_RU]=WhatsApp (Клиент с открытым кодом)
-X-Alterator-PackageList=etersoft/whatsapp
+X-Alterator-PackageList=etersoft/base/messengers/whatsapp
 X-Alterator-Required=no
-X-Alterator-Parent=etersoft/05_messengers
\ No newline at end of file
+X-Alterator-Parent=etersoft/groups/02_messengers

pkg.in/groups/etersoft/multimedia-amberol.directory → pkg.in/groups/etersoft/base/multimedia/amberol.directory

@@ -2,9 +2,9 @@
 Encoding=UTF-8
 Type=Directory
 Name=Amberol (Simple music player)
-X-Alterator-PackageList=etersoft/multimedia-amberol
+X-Alterator-PackageList=etersoft/base/multimedia/amberol
 X-Alterator-Parent=slinux/multimedia
-X-Alterator-Required=true
+X-Alterator-Required=yes
 Name[ru_RU]=Amberol (Простой музыкальный проигрыватель)
 X-Alterator-Conflicts=multimedia
 Categories=GNOME

pkg.in/groups/etersoft/multimedia-cassette.directory → pkg.in/groups/etersoft/base/multimedia/cassette.directory

@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Type=Directory
 Name=Cassette (Yandex Music client)
-X-Alterator-PackageList=etersoft/cassette
+X-Alterator-PackageList=etersoft/base/multimedia/cassette
 X-Alterator-Parent=slinux/multimedia
 X-Alterator-Required=no
 Name[ru_RU]=Кассета (Клиент Яндекс Музыки)

pkg.in/groups/etersoft/multimedia-showtime.directory → pkg.in/groups/etersoft/base/multimedia/clapper.directory

 [Desktop Entry]
 Encoding=UTF-8
 Type=Directory
-Name=Media player Showtime 
-X-Alterator-PackageList=etersoft/showtime
+Name=Media player Clapper
+X-Alterator-PackageList=etersoft/base/multimedia/clapper
 X-Alterator-Parent=slinux/multimedia
 X-Alterator-Required=yes
-Name[ru_RU]=Медиаплеер Showtime
+Name[ru_RU]=Медиаплеер Clapper
 X-Alterator-Conflicts=multimedia
 Categories=GNOME

pkg.in/groups/etersoft/multimedia-full-obs-studio.directory → pkg.in/groups/etersoft/base/multimedia/full-obs-studio.directory

@@ -3,7 +3,7 @@ Encoding=UTF-8
 Type=Directory
 Name=Streaming/Recording Software OBS Studio
 Name[ru_RU]=Программа для записи/трансляции видео OBS Studio
-X-Alterator-PackageList=slinux/multimedia-full-obs-studio
+X-Alterator-PackageList=etersoft/base/multimedia/full-obs-studio
 X-Alterator-Parent=slinux/multimedia
 X-Alterator-Required=yes
 X-Alterator-Conflicts=multimedia

pkg.in/groups/etersoft/multimedia-mpv.directory → pkg.in/groups/etersoft/base/multimedia/mpv.directory

@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Type=Directory
 Name=Media player MPV
-X-Alterator-PackageList=etersoft/multimedia-mpv
+X-Alterator-PackageList=etersoft/base/multimedia/mpv
 X-Alterator-Parent=slinux/multimedia
 X-Alterator-Required=no
 Name[ru_RU]=Медиаплеер MPV

pkg.in/groups/etersoft/office-atril.directory → pkg.in/groups/etersoft/base/office/atril.directory

@@ -3,6 +3,6 @@ Encoding=UTF-8
 Type=Directory
 Name=Atril Document Viewer (PDF, EPUB and more)
 Name[ru_RU]=Просмотрщик документов Atril (PDF, EPUB и другие)
-X-Alterator-PackageList=etersoft/atril
+X-Alterator-PackageList=etersoft/base/office/atril
 X-Alterator-Required=yes
-X-Alterator-Parent=etersoft/00_office
\ No newline at end of file
+X-Alterator-Parent=etersoft/groups/03_office

pkg.in/groups/etersoft/office-fragments.directory → pkg.in/groups/etersoft/base/office/fragments.directory

@@ -3,6 +3,6 @@ Encoding=UTF-8
 Type=Directory
 Name=Fragments (GTK4 BitTorrent client)
 Name[ru_RU]=Fragments (GTK4 битторрент-клиент)
-X-Alterator-PackageList=etersoft/fragments
+X-Alterator-PackageList=etersoft/base/office/fragments
 X-Alterator-Required=yes
-X-Alterator-Parent=etersoft/00_office
+X-Alterator-Parent=etersoft/groups/03_office

pkg.in/groups/etersoft/libreoffice-latest.directory → pkg.in/groups/etersoft/base/office/libreoffice-latest.directory

@@ -2,8 +2,8 @@
 Encoding=UTF-8
 Type=Directory
 Name=LibreOffice (latest)
-X-Alterator-PackageList=etersoft/libreoffice-latest
+X-Alterator-PackageList=etersoft/base/office/libreoffice-latest
 X-Alterator-Required=no
 Name[ru_RU]=LibreOffice (последний)
-X-Alterator-Parent=etersoft/00_office
-X-Alterator-Conflicts=etersoft/libreoffice-still
\ No newline at end of file
+X-Alterator-Parent=etersoft/groups/03_office
+X-Alterator-Conflicts=etersoft/base/office/libreoffice-still

pkg.in/groups/etersoft/libreoffice-still.directory → pkg.in/groups/etersoft/base/office/libreoffice-still.directory

@@ -2,8 +2,8 @@
 Encoding=UTF-8
 Type=Directory
 Name=LibreOffice-still (stable)
-X-Alterator-PackageList=etersoft/libreoffice
+X-Alterator-PackageList=etersoft/base/office/libreoffice-still
 X-Alterator-Required=yes
 Name[ru_RU]=LibreOffice-still (стабильный)
-X-Alterator-Parent=etersoft/00_office
-X-Alterator-Conflicts=etersoft/libreoffice-latest
\ No newline at end of file
+X-Alterator-Parent=etersoft/groups/03_office
+X-Alterator-Conflicts=etersoft/base/office/libreoffice-latest

pkg.in/groups/etersoft/peripherals-asusctl-rog-gui.directory → pkg.in/groups/etersoft/base/peripheral/asusctl-rog-gui.directory

@@ -4,6 +4,6 @@ Type=Directory
 Name=ASUSctl ROG GUI (Utility that allows you to manage many aspects of various ASUS laptops)
 Name[ru_RU]=ASUSctl ROG GUI (Утилита, позволяющая управлять многими аспектами различных ноутбуков ASUS)
 X-Alterator-Required=no
-X-Alterator-Parent=etersoft/02_peripheral
-X-Alterator-PackageList=etersoft/asusctl-rog-gui
+X-Alterator-Parent=etersoft/groups/01_peripheral
+X-Alterator-PackageList=etersoft/base/peripheral/asusctl-rog-gui
 Categories=Utilities

pkg.in/groups/etersoft/peripherals-openrgb.directory → pkg.in/groups/etersoft/base/peripheral/openrgb.directory

@@ -3,7 +3,7 @@ Encoding=UTF-8
 Type=Directory
 Name=OpenRGB (Program for controlling RGB lighting of different devices)
 X-Alterator-Required=no
-X-Alterator-Parent=etersoft/02_peripheral
-X-Alterator-PackageList=etersoft/openrgb
+X-Alterator-Parent=etersoft/groups/01_peripheral
+X-Alterator-PackageList=etersoft/base/peripheral/openrgb
 Name[ru_RU]=OpenRGB (Программа для управления RGB подсветкой разных устройств)
 Categories=Utilities
\ No newline at end of file

pkg.in/groups/etersoft/base/peripheral/printers.directory

+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Printers support
+X-Alterator-PackageList=etersoft/base/peripheral/printers
+X-Alterator-Required=no
+X-Alterator-Parent=etersoft/groups/01_peripheral
+Name[ru_RU]=Поддержка принтеров
+Categories=Utilities

pkg.in/groups/etersoft/peripherals-simple-scan.directory → pkg.in/groups/etersoft/base/peripheral/scanners.directory

@@ -2,8 +2,8 @@
 Encoding=UTF-8
 Type=Directory
 Name=Scanner support
-X-Alterator-PackageList=etersoft/for_scanners
+X-Alterator-PackageList=etersoft/base/peripheral/scanners
 X-Alterator-Required=no
-X-Alterator-Parent=etersoft/02_peripheral
+X-Alterator-Parent=etersoft/groups/01_peripheral
 Name[ru_RU]=Поддержка сканеров
 Categories=Utilities

pkg.in/groups/etersoft/settings-base.directory → pkg.in/groups/etersoft/base/settings/base.directory

@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Type=Directory
 Name=Basic Preset Settings (general)
-X-Alterator-PackageList=etersoft/base-settings
+X-Alterator-PackageList=etersoft/base/settings/base
 X-Alterator-Required=yes
-X-Alterator-Parent=etersoft/00_settings
+X-Alterator-Parent=etersoft/groups/00_settings
 Name[ru_RU]=Основные преднастройки (общие)

pkg.in/groups/etersoft/base/settings/flatpak.directory

+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Flathub repository
+X-Alterator-PackageList=slinux/flatpak
+X-Alterator-Required=yes
+X-Alterator-Parent=etersoft/groups/00_settings
+Name[ru_RU]=Репозиторий Flathub

pkg.in/groups/etersoft/base/system-management/amd.directory

+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Utilities for AMD graphics cards
+Name[ru_RU]=Утилиты для видеокарт AMD
+X-Alterator-Required=no
+X-Alterator-Parent=etersoft/groups/01_system-management
+X-Alterator-PackageList=etersoft/base/system-management/amd
+Categories=Utilities

pkg.in/groups/etersoft/z01_gparted.directory → pkg.in/groups/etersoft/base/system-management/gparted.directory

@@ -4,5 +4,6 @@ Type=Directory
 Name=GParted (Disk partition management program)
 Name[ru_RU]=GParted (Программа для управления разделами дисков)
 X-Alterator-Required=no
-X-Alterator-PackageList=etersoft/gparted
+X-Alterator-Parent=etersoft/groups/01_system-management
+X-Alterator-PackageList=etersoft/base/system-management/gparted
 Categories=Utilities

pkg.in/groups/etersoft/base/system-management/nvidia.directory

+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Utilities for NVIDIA graphics cards
+Name[ru_RU]=Утилиты для видеокарт NVIDIA
+X-Alterator-Required=no
+X-Alterator-Parent=etersoft/groups/01_system-management
+X-Alterator-PackageList=etersoft/base/system-management/nvidia
+Categories=Utilities

pkg.in/groups/etersoft/z99_timeshift.directory → pkg.in/groups/etersoft/base/system-management/timeshift.directory

@@ -2,6 +2,7 @@
 Encoding=UTF-8
 Type=Directory
 Name=Timeshift (System backup tool)
-X-Alterator-PackageList=etersoft/timeshift
+X-Alterator-Parent=etersoft/groups/01_system-management
+X-Alterator-PackageList=etersoft/base/system-management/timeshift
 X-Alterator-Required=yes
 Name[ru_RU]=Timeshift (Инструмент для создания бекапов системы)

pkg.in/groups/etersoft/gnome-boxes.directory → pkg.in/groups/etersoft/base/virt-machines/gnome-boxes.directory

@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Type=Directory
 Name=Gnome Boxes (a tool for working with virtual machines from Gnome)
-X-Alterator-PackageList=etersoft/gnome-boxes
+X-Alterator-PackageList=etersoft/base/virt-machines/gnome-boxes
 X-Alterator-Required=no
-X-Alterator-Parent=etersoft/virt-machines
+X-Alterator-Parent=etersoft/groups/04_virt-machines
 Name[ru_RU]=Gnome Boxes (инструмент для работы с виртуальными машинами от Gnome)

pkg.in/groups/etersoft/virt-manager.directory → pkg.in/groups/etersoft/base/virt-machines/virt-manager.directory

@@ -4,5 +4,5 @@ Type=Directory
 Name=Virt-Manager (graphical console for managing KVM virtual machines)
 X-Alterator-PackageList=centaurus/virt-manager
 X-Alterator-Required=no
-X-Alterator-Parent=etersoft/virt-machines
+X-Alterator-Parent=etersoft/groups/04_virt-machines
 Name[ru_RU]=Virt-Manager (графическая консоль для управления виртуальными машинами KVM)

pkg.in/groups/etersoft/virtualbox.directory → pkg.in/groups/etersoft/base/virt-machines/virtualbox.directory

@@ -3,6 +3,6 @@ Encoding=UTF-8
 Type=Directory
 Name=VirtualBox desktop virtualization
 Name[ru_RU]=Настольная виртуализация (VirtualBox)
-X-Alterator-PackageList=etersoft/virtualbox
+X-Alterator-PackageList=etersoft/base/virt-machines/virtualbox
 X-Alterator-Required=no
-X-Alterator-Parent=etersoft/virt-machines
\ No newline at end of file
+X-Alterator-Parent=etersoft/groups/04_virt-machines

pkg.in/groups/etersoft/browsers-chromium.directory

-[Desktop Entry]
-Encoding=UTF-8
-Type=Directory
-Name=Chromium
-X-Alterator-Required=yes
-X-Alterator-Parent=etersoft/03_browsers
-X-Alterator-PackageList=etersoft/chromium
-Categories=Networking
-Name[ru_RU]=Chromium
\ No newline at end of file

pkg.in/groups/etersoft/browsers-newmoon.directory

-[Desktop Entry]
-Encoding=UTF-8
-Type=Directory
-Name=New Moon
-X-Alterator-Required=no
-X-Alterator-Parent=etersoft/03_browsers
-X-Alterator-PackageList=etersoft/newmoon
-Categories=Networking
-Name[ru_RU]=New Moon (Шустрый браузер с классическим видом)
\ No newline at end of file

pkg.in/groups/etersoft/gnome-a11y.directory → pkg.in/groups/etersoft/gnome/accessibility/gnome-a11y.directory

@@ -3,6 +3,7 @@ Encoding=UTF-8
 Type=Directory
 Name=Gnome Accessability
 Name[ru_RU]=Gnome Accessability
-X-Alterator-PackageList=etersoft/gnome-a11y
+X-Alterator-Parent=etersoft/groups/01_accessibility
+X-Alterator-PackageList=etersoft/gnome/accessibility/gnome-a11y
 X-Alterator-Required=no
 Categories=GNOME

pkg.in/groups/etersoft/dev-tools-gnome-ssh-agent.directory → pkg.in/groups/etersoft/gnome/dev-tools/gnome-ssh-agent.directory

@@ -3,7 +3,7 @@ Encoding=UTF-8
 Type=Directory
 Name=GNOME ssh agent
 X-Alterator-Required=no
-X-Alterator-Parent=etersoft/04_dev-tools
-X-Alterator-PackageList=etersoft/gnome-ssh-agent
+X-Alterator-Parent=etersoft/groups/04_dev-tools
+X-Alterator-PackageList=etersoft/gnome/dev-tools/gnome-ssh-agent
 Name[ru_RU]=GNOME ssh агент
 Categories=Development

pkg.in/groups/etersoft/settings-gnome.directory → pkg.in/groups/etersoft/gnome/settings/base.directory

@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Type=Directory
 Name=Basic Preset Settings (GNOME Environment)
-X-Alterator-PackageList=etersoft/gnome-settings
+X-Alterator-PackageList=etersoft/gnome/settings/base
 X-Alterator-Required=yes
-X-Alterator-Parent=etersoft/00_settings
+X-Alterator-Parent=etersoft/groups/00_settings
 Name[ru_RU]=Основные преднастройки (среда GNOME)

pkg.in/groups/etersoft/groups/01_accessibility.directory

+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Special Applications (Accessibility)
+X-Alterator-Required=no
+X-Alterator-PackageList=zero
+Name[ru_RU]=Программы повышения доступности
+Categories=Accessibility

pkg.in/groups/etersoft/groups/01_system-management.directory

+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=System management
+X-Alterator-Required=no
+X-Alterator-PackageList=zero
+Name[ru_RU]=Утилиты для управления системой
+Categories=Utilities

pkg.in/groups/etersoft/settings-hyprland.directory → pkg.in/groups/etersoft/hyprland/settings/base.directory

@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Type=Directory
 Name=Basic Preset Settings (Hyprland wm)
-X-Alterator-PackageList=etersoft/hyprland-settings
+X-Alterator-PackageList=etersoft/hyprland/settings/base
 X-Alterator-Required=yes
-X-Alterator-Parent=etersoft/00_settings
+X-Alterator-Parent=etersoft/groups/00_settings
 Name[ru_RU]=Основные преднастройки (оконный менеджер Hyprland)

pkg.in/lists/etersoft/base/multimedia/clapper

+clapper

pkg.in/lists/etersoft/base/peripheral/printers

+system-config-printer

pkg.in/lists/etersoft/chromium

-chromium
-webapp-manager