education.mk: move unnecessary packages from live to base system

conf.d/education.mk

@@ -17,18 +17,19 @@ mixin/education: \
 	@$(call add,THE_BRANDING,indexhtml)
 	@$(call add,THE_BRANDING,menu xfce-settings system-settings)
 	@$(call add,THE_LISTS,slinux/xfce-base)
-	@$(call add,THE_LISTS,education/misc)
+	@$(call add,THE_LISTS,education/misc-base)
+	@$(call add,BASE_LISTS,education/misc)
 	@$(call add,THE_PACKAGES,etcnet alterator-net-eth) # Remove etcnet in future
 ifeq (,$(filter-out e2k%,$(ARCH)))
-	@$(call add,THE_PACKAGES,jre)
+	@$(call add,BASE_PACKAGES,jre)
 else
-	@$(call add,THE_PACKAGES,java-11-openjdk)
+	@$(call add,BASE_PACKAGES,java-11-openjdk)
 	@$(call add,THE_PACKAGES,installer-feature-quota-stage2)
 endif
 	@$(call add,THE_PACKAGES,mousepad)
-	@$(call add,THE_PACKAGES,thunderbird)
+	@$(call add,BASE_PACKAGES,thunderbird)
 ifeq (,$(filter-out x86_64,$(ARCH)))
-	@$(call add,THE_PACKAGES,yandex-browser-alt-education)
+	@$(call add,BASE_PACKAGES,yandex-browser-alt-education)
 endif
 	@$(call add,THE_PACKAGES,installer-feature-lightdm-stage3)                            
 	@$(call add,THE_LISTS,$(call tags,base l10n))
@@ -55,7 +56,7 @@ mixin/education-lite: \
 	@$(call add,THE_PACKAGES,installer-feature-quota-stage2)
 	@$(call add,THE_LISTS,$(call tags,base l10n))
 	@$(call add,THE_LISTS,$(call tags,base regular))
-	@$(call add,THE_LISTS,$(call tags,base extra))
+	@$(call add,BASE_LISTS,$(call tags,base extra))
 ifeq (distro,$(IMAGE_CLASS))
 
 mixin/education-live: \
@@ -113,7 +114,7 @@ mixin/education-base: \
 	@$(call set,META_VOL_ID,ALT Education $(DISTRO_VERSION))
 	@$(call set,META_APP_ID,ALT Education $(DISTRO_VERSION) $(ARCH) $(shell date +%F))
 	@$(call add,THE_PACKAGES,bluez pulseaudio-bluez)
-	@$(call add,THE_PACKAGES,alterator-fbi)
+	@$(call add,BASE_PACKAGES,alterator-fbi)
 	@$(call add,THE_PACKAGES,alt-rootfs-installer)
 	@$(call add,THE_PACKAGES,btrfs-progs)
 	@$(call add,STAGE2_PACKAGES,xorg-conf-libinput-touchpad)
@@ -192,15 +193,15 @@ else
 	@$(call add,MAIN_GROUPS,education/06_kde)
 endif	# e2k%
 ifeq (,$(filter-out x86_64,$(ARCH)))
-	@$(call add,THE_KMODULES,virtualbox)
+	@$(call add,BASE_KMODULES,virtualbox)
 endif
-	@$(call add,THE_KMODULES,lsadrv bbswitch)
+	@$(call add,BASE_KMODULES,lsadrv bbswitch)
 	@$(call add,THE_KMODULES,staging)
 	@$(call add,MAIN_KMODULES,bbswitch)
 	@$(call add,THE_PACKAGES,mc-full)
 	@$(call add,THE_PACKAGES,remmina remmina-plugins)
 ifeq (,$(filter-out i586 x86_64,$(ARCH)))
-	@$(call add,THE_PACKAGES,syslinux)
+	@$(call add,MAIN_PACKAGES,syslinux)
 	@$(call add,MAIN_PACKAGES,owamp-server)
 endif
 	@$(call add,CONTROL,sudo:public)

pkg.in/lists/education/misc

-#Base packages
-su
-sudo
-
-# Multimedia
-vlc-maxi
-simplescreenrecorder
-
-# better optimized for 8C
-mplayer@E2K
-libva-driver-intel@X86
-libva-intel-media-driver@x86_64
-vulkan-amdgpu@X86
-
 # Graphics
-ristretto
 simple-scan
 sane
 sane-frontends
-atril-gtk
-atril-gtk-djvu
-atril-gtk-pixbuf
-atril-gtk-xps
 shutter
 
 # Games
@@ -34,61 +15,10 @@ gnome-games-sol@!E2K
 goldendict@!E2K
 stardict@E2K
 dict-mueller7-utf8
-aspell-ru-lebedev
-hunspell-ru-lebedev
-
-# Fonts
-fonts-ttf-google-droid-.*
-fonts-ttf-ubuntu-font-family
-fonts-ttf-liberation
-fonts-ttf-dejavu
-fonts-ttf-gost
-fonts-ttf-xorg
-fonts-ttf-PTAstra
-fonts-ttf-XO
-fonts-ttf-google-noto-sans
-fonts-ttf-google-crosextra-caladea
-fonts-ttf-google-crosextra-carlito
-fonts-ttf-wqy-zenhei
-fonts-ttf-unifont
 
 # Alterator
-alterator-browser-qt
 alterator-fbi
-alterator-standalone
-alterator-notes
-
-alterator-auth
-alterator-control
-alterator-datetime
-alterator-gpupdate
-alterator-groups
-alterator-grub
-alterator-logs
-alterator-net-eth
-alterator-net-general
-alterator-net-openvpn
-alterator-net-pppoe
-alterator-net-pptp
-alterator-net-wifi
-alterator-osec
-alterator-packages
-alterator-pkg
-alterator-ports-access
-alterator-printers
-alterator-root
-alterator-services
-alterator-sslkey
-alterator-sysconfig
-alterator-sysinfo
 alterator-update-kernel
-alterator-updates
-alterator-usbguard
-alterator-usbmount
-alterator-users
-alterator-x11
-alterator-xkb
-alterator-zram-swap
 
 # Authentication and computer management via group policy
 task-auth-ad-sssd
@@ -106,46 +36,8 @@ shared-desktop-icons
 control++
 
 # Base utilities
-tzdata
-vim-console
-rsync
-strace
-anacron
-os-prober
-make-initrd-lvm
-shadow-change
-b43-fwcutter
-pam-limits-desktop
-bash-completion
-mc-full
-inxi
-hw-probe
-hwinfo@X86
-attr
-rfkill
-fvwm-
-fvwm-full-
-apt-repo
-eepm
-apt-rsync
-apt-updatecache
-xdg-user-dirs
-vconsole-setup-kludge
-systemd-analyze
 fwupd@x86_64
 
-# Other utulities and beautifications
-color-prompt-and-man
-vlock
-perl-Crypt-Rijndael
-osec-mailreport
-adjtimex
-opensc
-zsh
-screen
-apcupsd
-disable-usb-autosuspend
-
 # GUI utilities
 gparted
 nvidia-xconfig@X86
@@ -172,8 +64,6 @@ polkit-rule-udisks2-mount
 userpasswd
 
 # Package managenment
-synaptic
-synaptic-usermode
 gnome-software
 gnome-software-disable-updates
 packagekit
@@ -185,11 +75,6 @@ appinstall
 flatpak
 flatpak-repo-flathub@!E2K,riscv64
 
-# Menu
-altlinux-freedesktop-menu-shallow-menu
-altlinux-freedesktop-menu-mate-like-menu
-altlinux-freedesktop-menu-icon-theme-default
-
 # Fallback themes
 gnome-icon-theme
 gnome-icon-theme-symbolic
@@ -204,21 +89,12 @@ pinentry-qt5-
 gtk2-ssh-askpass
 
 # Hardware and computer peripherals support
-alt-rootfs-installer
 cups
 cups-filters
 cups-pdf
 avahi-daemon
-blueman
-udev-rules-rfkill-uaccess
 update-kernel
 printer-drivers-base
-udev-extras
-fdisk
-gdisk
-parted
-partclone
-ntfs-3g
 xorg-drv-wacom
 ocfs2-tools
 cpufreq-simple@X86
@@ -226,89 +102,11 @@ hplip-sane
 gutenprint-cups-ppds
 sane-airscan
 ipp-usb
-udev-rule-generator-cdrom
-xorg-drv-synaptics
-xorg-conf-synaptics
-xinput
-xorg-drv-libinput
-usbutils
-iio-sensor-proxy
-
-# Network utilities
-iproute2
-net-tools
-openssh-server
-openssh-clients
-dhcpcd
-telnet
-cifs-utils
-hostname-hook-hosts
-libnss-mdns
-i586-glibc-nss@x86_64
-i586-libnss-mdns@x86_64
-i586-libnss-myhostname@x86_64
-autossh
-ntpdate
-keyutils
-krb5-kinit
-openresolv-bind
-ipset
-lftp
-links2
-samba-usershares
-
-# Multimedia support
-pulseaudio-daemon
-pulseaudio-utils
-pavucontrol
-alsa-plugins-pulse
-gst-plugins-base1.0
-gst-plugins-good1.0
-gst-plugins-bad1.0
-gst-plugins-ugly1.0
-alsa-set-initial-options
-dvgrab
-mjpegtools
-jackd
-test-audio
-wodim
-glxgears
-glxinfo
 
 # Communications
 pidgin
 pidgin-libnotify
 
-# Other stuff
-htop
-avplay
-cabextract
-cheese
-libsqlite3
-lm_sensors3-utils
-man-pages-ru
-media-player-info
-nano
-quick-usb-formatter
-rpm-build
-setbranding
-system-report
-zbar
-audit
-vixie-cron
-neofetch
-debhelper
-xdg-user-dirs-gtk
-libgtk2-engine-adwaita
-pv
-
-# New stuff
-xfce4-whiskermenu-plugin
-alacarte
-mugshot
-xfce-polkit
-screenkey
-
 # Search
 recoll-extras
 perl-Image-ExifTool
@@ -321,21 +119,9 @@ aspell
 aspell-ru-rk
 xpdf-utils
 
-# Append all modules from xscreensaver
-desktop-screensaver-modules-xscreensaver
-desktop-screensaver-modules-xscreensaver-gl
-systemd-settings-enable-showstatus
-systemd-settings-enable-log-to-tty12
-
-# Other architecture-depended utilities
-task-edu-tools@META
-
-# Russian Root CA certificate
-ca-certificates-digital.gov.ru
-ca-certificates-tlscc.ru
-
-xauthority-hostname-updater
+# New stuff
+mugshot
 
-# Additional repositories
-apt-conf-r7@x86_64
-apt-conf-netpolice@x86_64
+# Other stuff
+cabextract
+cheese

pkg.in/lists/education/misc-base

+# Base utilities
+su
+sudo
+tzdata
+vim-console
+rsync
+strace
+anacron
+os-prober
+make-initrd-lvm
+shadow-change
+b43-fwcutter
+pam-limits-desktop
+bash-completion
+mc-full
+inxi
+hw-probe
+hwinfo@X86
+attr
+rfkill
+fvwm-
+fvwm-full-
+apt-repo
+eepm
+apt-rsync
+apt-updatecache
+xdg-user-dirs
+vconsole-setup-kludge
+systemd-analyze
+
+# better optimized for 8C
+mplayer@E2K
+libva-driver-intel@X86
+libva-intel-media-driver@x86_64
+vulkan-amdgpu@X86
+
+# Graphics
+ristretto
+atril-gtk
+atril-gtk-djvu
+atril-gtk-pixbuf
+atril-gtk-xps
+
+# Multimedia
+vlc-maxi
+simplescreenrecorder
+
+# Dictionary
+aspell-ru-lebedev
+hunspell-ru-lebedev
+
+# Fonts
+fonts-ttf-google-droid-.*
+fonts-ttf-ubuntu-font-family
+fonts-ttf-liberation
+fonts-ttf-dejavu
+fonts-ttf-gost
+fonts-ttf-xorg
+fonts-ttf-PTAstra
+fonts-ttf-XO
+fonts-ttf-google-noto-sans
+fonts-ttf-google-crosextra-caladea
+fonts-ttf-google-crosextra-carlito
+fonts-ttf-wqy-zenhei
+fonts-ttf-unifont
+
+# Alterator
+alterator-browser-qt
+alterator-fbi
+alterator-standalone
+alterator-notes
+alterator-auth
+alterator-control
+alterator-datetime
+alterator-gpupdate
+alterator-groups
+alterator-grub
+alterator-logs
+alterator-net-eth
+alterator-net-general
+alterator-net-openvpn
+alterator-net-pppoe
+alterator-net-pptp
+alterator-net-wifi
+alterator-osec
+alterator-packages
+alterator-pkg
+alterator-ports-access
+alterator-printers
+alterator-root
+alterator-services
+alterator-sslkey
+alterator-sysconfig
+alterator-sysinfo
+alterator-updates
+alterator-usbguard
+alterator-usbmount
+alterator-users
+alterator-x11
+alterator-xkb
+alterator-zram-swap
+
+# Other utulities and beautifications
+color-prompt-and-man
+vlock
+perl-Crypt-Rijndael
+osec-mailreport
+adjtimex
+opensc
+zsh
+screen
+apcupsd
+disable-usb-autosuspend
+
+# Package managenment
+synaptic
+synaptic-usermode
+
+# Menu
+altlinux-freedesktop-menu-shallow-menu
+altlinux-freedesktop-menu-mate-like-menu
+altlinux-freedesktop-menu-icon-theme-default
+
+# Hardware and computer peripherals support
+alt-rootfs-installer
+blueman
+udev-rules-rfkill-uaccess
+udev-rule-generator-cdrom
+xorg-drv-synaptics
+xorg-conf-synaptics
+xinput
+xorg-drv-libinput
+usbutils
+iio-sensor-proxy
+udev-extras
+fdisk
+gdisk
+parted
+partclone
+ntfs-3g
+
+# Network utilities
+iproute2
+net-tools
+openssh-server
+openssh-clients
+dhcpcd
+telnet
+cifs-utils
+hostname-hook-hosts
+libnss-mdns
+i586-glibc-nss@x86_64
+i586-libnss-mdns@x86_64
+i586-libnss-myhostname@x86_64
+autossh
+ntpdate
+keyutils
+krb5-kinit
+openresolv-bind
+ipset
+lftp
+links2
+samba-usershares
+
+# Multimedia support
+pulseaudio-daemon
+pulseaudio-utils
+pavucontrol
+alsa-plugins-pulse
+gst-plugins-base1.0
+gst-plugins-good1.0
+gst-plugins-bad1.0
+gst-plugins-ugly1.0
+alsa-set-initial-options
+dvgrab
+mjpegtools
+jackd
+test-audio
+wodim
+glxgears
+glxinfo
+
+# Other stuff
+htop
+avplay
+libsqlite3
+lm_sensors3-utils
+man-pages-ru
+media-player-info
+nano
+quick-usb-formatter
+rpm-build
+setbranding
+system-report
+zbar
+audit
+vixie-cron
+neofetch
+debhelper
+xdg-user-dirs-gtk
+libgtk2-engine-adwaita
+pv
+
+# New stuff
+xfce4-whiskermenu-plugin
+alacarte
+xfce-polkit
+screenkey
+
+# Append all modules from xscreensaver
+desktop-screensaver-modules-xscreensaver
+desktop-screensaver-modules-xscreensaver-gl
+systemd-settings-enable-showstatus
+systemd-settings-enable-log-to-tty12
+
+# Other architecture-depended utilities
+task-edu-tools@META
+
+# Russian Root CA certificate
+ca-certificates-digital.gov.ru
+ca-certificates-tlscc.ru
+
+xauthority-hostname-updater
+
+# Additional repositories
+apt-conf-r7@x86_64
+apt-conf-netpolice@x86_64