package lists: reorder, remove non existing packages, add section headers

2020-04-06 19:18:09 +02:00
parent bb58ccd693
commit 3e5fa08083
8 changed files with 269 additions and 300 deletions
--- a/config/package-lists/audio-video.list.chroot
+++ b/config/package-lists/audio-video.list.chroot
@@ -1,7 +1,8 @@
-# Video players
+#Title: Audio/video
+#Section: Video players
 #Description: mpv
-mpv
 #Description: vlc
+mpv
 vlc
 libdvdread4
 vlc-plugin-notify
@@ -29,8 +30,10 @@ libdvd-pkg
 #Alt: vlc-plugin-zvbi
 #Alt: zapping

-# music players/library managers
+#Section: Music players/library managers
 #Description: quodlibet
+#Description: exfalso
+exfalso
 quodlibet
 libgpod-common
 libgpod4
@@ -38,6 +41,7 @@ python-cddb
 python-feedparser
 python-musicbrainzngs
 python-pyinotify
+sox
 #Alt: gnome-music
 #Alt: rhythmbox
 #Alt: rhythmbox-plugins
@@ -52,17 +56,10 @@ python-pyinotify
 #Alt: cantata
 #Alt: ncmpcpp
 #Alt: mpc
-
-# console music players
-sox
 #Alt: moc
 #Alt: cmus
 #Alt: moc-ffmpeg-plugin
 #Alt: mpg123
-
-# ID3 tag management
-#Description: exfalso
-exfalso
 #Alt: beets
 #Alt: cowbell
 #Alt: easytag
@@ -71,20 +68,32 @@ exfalso
 #Alt: kid3
 #Alt: picard
 #Alt: mussort
+#Alt: musique
+#Alt: radiotray
+#Alt: vagalume
+#Alt: gpodder
+#Alt: go-mtpfs
+#Alt: gtkpod
+#Alt: playerctl
+#Alt: streamtuner2

-# webcam
+
+
+#Section: Webcam
 #Description: cheese
 cheese
 gnome-video-effects
 #Alt: guvcview
 #Alt: gnome-video-effects-frei0r
+#Alt: v4l2loopback-dkms
+#Alt: v4l2loopback-utils
 #kamoso #stretch only
 #zoneminder #stretch only

-# screencast/screen recording/streaming
+#Section: Screen recording/screencasting
 #Description: obs-studio
-obs-studio
 #Description: vokoscreen
+obs-studio
 vokoscreen
 #Alt: gtk-recordmydesktop
 #Alt: key-mon
@@ -94,29 +103,10 @@ vokoscreen
 #Alt: simplescreenrecorder


-# media converters
+#Section: Media conversion/codecs
 #Description: qwinff
 qwinff
 ffmpeg
-#Alt: handbrake
-#Alt: mp3splt
-#Alt: oggvideotools
-#Alt: ogmrip
-#Alt: ogmrip-plugins
-#Alt: soundconverter
-#Alt: winff
-#Alt: winff-doc
-#Alt: winff-qt
-
-# audio CD extractors
-#Description: asunder
-asunder
-#Alt: sound-juicer
-#Alt: goobox
-#Alt: ripperx
-#Alt: xcfa
-
-# codecs
 flac
 gstreamer1.0-alsa
 gstreamer1.0-libav
@@ -131,35 +121,40 @@ lame
 libmp3lame0
 libxvidcore4
 musepack-tools
-#Alt: x264
-#Alt: x265
-
-
-# other utilities
 mediainfo
 media-player-info
-#Alt: go-mtpfs
-#Alt: go-mtpfs
-#Alt: gpodder
-#Alt: gtkpod
-#Alt: mat
-#Alt: minidisc-utils
-#Alt: musique
-#Alt: playerctl
+#Alt: handbrake
+#Alt: mp3splt
+#Alt: oggvideotools
+#Alt: ogmrip
+#Alt: ogmrip-plugins
+#Alt: soundconverter
+#Alt: winff
+#Alt: winff-doc
+#Alt: winff-qt
+#Alt: x264
+#Alt: x265
 #Alt: qhimdtransfer
-#Alt: radiotray
-#Alt: streamtuner2
-#Alt: v4l2loopback-dkms
-#Alt: v4l2loopback-utils
-#Alt: vagalume
+#Alt: minidisc-utils
+#Alt: mat

-# subtitles
+
+#Section: Audio CD extraction
+#Description: asunder
+asunder
+#Alt: sound-juicer
+#Alt: goobox
+#Alt: ripperx
+#Alt: xcfa
+
+
+#Section: Subtitles
 #Alt: subtitleeditor
-#subliminal #stretch only
 #Alt: gaupol
 #Alt: gnome-subtitles
+#subliminal #stretch only

-# sound recording and editing
+#Section: audio recording and editing
 #Description: audacity
 #Description: gnome-sound-recorder
 audacity
@@ -167,11 +162,11 @@ gnome-sound-recorder
 #Alt: gwc
 #Alt: gjacktransport

-# lighting
+##Section: Lighting
 #qlcplus #bullseye only


-# audio system
+#Section: Audio system
 #Description: pulseaudio
 pavucontrol
 pulseaudio
--- a/config/package-lists/development.list.chroot
+++ b/config/package-lists/development.list.chroot
@@ -1,11 +1,11 @@
-# version control
+#Title: Development
+#Section: Version control
 #Description: gitg
-gitg
-#Description: git
-git
 #Description: meld
-meld
 #Description: gource
+gitg
+git
+meld
 gource
 colordiff
 dwdiff
@@ -25,7 +25,7 @@ cloc
 #Alt: icdiff
 #Alt: qgit

-# shell & basic utilities
+#Section: Shell & basic utilities
 bash
 autojump
 bash-completion
@@ -44,7 +44,7 @@ manpages-dev
 #Alt: undistract-me
 #Alt: inotify-tools
 #Alt: lr
-#Alt: ack-grep
+#Alt: ack
 #Alt: bd
 #Alt: beep
 #Alt: command-not-found
@@ -61,7 +61,7 @@ manpages-dev
 #Alt: ripgrep


-# Parsers/converters/documentation generators
+#Section: Parsers/converters/documentation generators
 pandoc
 jq
 xmlstarlet
@@ -75,7 +75,7 @@ dos2unix
 #Alt: roffit
 #Alt: archmage

-# Packaging
+#Section: Packaging
 debhelper
 autoconf
 devscripts
@@ -94,17 +94,17 @@ git-buildpackage
 #Alt: dgit
 #Alt: aptly

-# debugging
+#Section: Debuggers
 gdb

-# python3
+#Section: Python
 python3-all-dev
 python3-setuptools
 python3-wheel
 python3-pip
 python3-venv

-# Live system
+#Section: Live system
 live-build
 #Alt: debootstrap
 #Alt: live-config-doc
@@ -124,23 +124,22 @@ live-build
 #Alt: live-task-recommended
 #Alt: live-task-xfce

-# hex editors
+#Section: Hex editors
 #Alt: wxhexeditor
 #Alt: hexcurse
 #Alt: dhex
 #Alt: bless

-# translations
+#Section: Translation/localization
 #Alt: poedit

-# game development
+#Section: Game development
 #Alt: godot3

-# Ruby
-#Alt: rubygems
+#Section: Ruby
 #Alt: ruby-dev

-# html/css/js
+#Section: HTML/CC/JS
 #Alt: csstidy
 #Alt: sqlite3
 #Alt: webcheck
@@ -149,10 +148,10 @@ live-build
 #Alt: npm
 #Alt: jsbeautifier

-# php
+#Section: PHP
 #Alt: php-cli

-# android
+#Section: Android
 #Alt: android-sdk
 #Alt: android-sdk-platform-tools-common
 #Alt: android-tools-fastboot
--- a/config/package-lists/games.list.chroot
+++ b/config/package-lists/games.list.chroot
@@ -1,9 +1,11 @@
-# games
+#Title: Games
+
+#Section: Linux games
 cmatrix
 cmatrix-xfont
 #Alt: endless-sky
 #Alt: play.it
-#Alt: steam
+#Alt: steam:i386
 #Alt: supertuxkart
 #Alt: hedgewars
 #Alt: 0ad
@@ -58,12 +60,9 @@ cmatrix-xfont
 #Alt: sl
 #Alt: hollywood

-	
-
-
-# game console emulators
+#Section: Game console emulators
 #Alt: pcsxr
-#Alt: zsnes
+#Alt: zsnes:i386
 #Alt: higan
 #Alt: desmume
 #Alt: mupen64plus-qt
@@ -99,7 +98,6 @@ cmatrix-xfont
 #Alt: nestopia
 #Alt: dosbox
 #Alt: dolphin-emu
-#Alt: pcsx2
+#Alt: pcsx2:i386
 #Alt: games-emulator
 #mess mess-desktop-entries #stretch only
-
--- a/config/package-lists/graphics.list.chroot
+++ b/config/package-lists/graphics.list.chroot
@@ -1,4 +1,6 @@
-# image viewers
+#Title: Graphics
+
+#Section: Image viewers
 #Description: ristretto
 ristretto
 #Alt: eog
@@ -15,7 +17,7 @@ ristretto
 #Alt: sxiv
 #Alt: catimg

-# image editors
+#Section: Image editors
 #Description: gimp
 gimp
 gimp-data-extras
@@ -28,24 +30,6 @@ gimp-gmic
 gimp-lensfun
 create-resources
 gimp-help-fr
-
-# vector image editors
-#Description: inkscape
-inkscape
-create-resources
-python-lxml
-pstoedit
-#Alt: pencil2d
-#Alt: dia
-#Alt: birdfont
-#Alt: python-uniconvertor
-
-
-# drawing editors
-#Description: xournal
-xournal
-
-# Other editors
 #Alt: krita
 #pinta #stretch only
 #Alt: mypaint
@@ -54,30 +38,46 @@ xournal
 #Alt: gnome-paint
 #Alt: delaboratory

-# Non-destructive editors (lightroom)
+#Section: Vector editors
+#Description: inkscape
+inkscape
+create-resources
+python-lxml
+pstoedit
+#Alt: pencil2d
+#Alt: dia
+#Alt: birdfont
+
+
+#Section: Drawing
+#Description: xournal
+xournal
+
+
+#Section: Non-destructive editors (lightroom)
 #Alt: darktable
 #Alt: rawtherapee
 #Alt: luminance-hdr

-# Color pickers
+#Section: Color pickers
 #gcolor2 #stretch only
 #agave #stretch only
 #Alt: gpick

-# Batch processing
+#Section: Batch image processing
 #phatch #stretch only
 #Alt: aspic
 #Alt: pixelize
 #Alt: hugin
 #Alt: aaphoto

-# Camera/upload management
+#Section: Camera upload/management
 #Alt: rapid-photo-downloader
 #Alt: gtkam
 #postr #stretch only
 #flickrbackup #stretch only

-# Image library managers
+#Section: Image library managers
 #Alt: nomacs
 #Alt: shotwell
 #Alt: gthumb
@@ -85,29 +85,29 @@ xournal
 #Alt: fotoxx
 #Alt: geeqie

-# Game asset editors
+#Section: Game asset editors
 #aseprite #stretch only
 #Alt: tiled
 #Alt: games-content-dev

-# Color management
+#Section: Color grading
 #Alt: colorhug-client

-# diagram editors
+#Section: Diagram editors
 #Description: dia
 dia
 dia-shapes
 gsfonts-x11 
 #Alt: asciio

-# Label/barcode editors (disabled)
+#Section: Label/barcode editors
 ##Screenshot: glabels
 #Alt: glabels
 #Alt: qrencode
 #Alt: qtqr
 #Alt: zbar-tools

-# 3D editors
+#Section: 3D editors
 #Description: blender
 blender
 #Alt: makehuman
@@ -118,14 +118,14 @@ blender
 #Alt: sweethome3d-textures-editor
 #Alt: sweethome3d-furniture-nonfree

-# CAD editors
+#Section: CAD editors
 #Alt: librecad
 #Alt: kicad
 #Alt: freecad
 #Alt: pcb-gtk
 #Alt: qelectrotech

-# Video editors
+#Section: Video editors
 #Alt: openshot
 #Alt: kdenlive
 #Alt: devede
@@ -148,7 +148,7 @@ blender
 #Alt: stopmotion
 #Alt: education-video

-# image manipulation/command-line
+#Section: Command-line image manipulation
 imagemagick
 optipng
 advancecomp
--- a/config/package-lists/network.list.chroot
+++ b/config/package-lists/network.list.chroot
@@ -1,5 +1,7 @@
-# web browsers
-#Description: firefox
+#Title: Network
+
+#Section: Web browsers
+#Description: firefox-esr
 firefox-esr
 firefox-esr-l10n-fr
 pkg-mozilla-archive-keyring
@@ -14,7 +16,7 @@ webext-ublock-origin
 #Alt: surf
 #Alt: elinks

-# instant messaging
+#Section: Instant messaging
 #Description: pidgin
 pidgin
 pidgin-otr
@@ -27,26 +29,22 @@ pidgin-gnome-keyring
 #Alt: telegram-desktop
 #Alt: pidgin-skype
 #Alt: yowsup-cli
-
-# xmpp/jabber
 #Alt: dino-im
 #Alt: gajim
 #Alt: mcabber
-
-# irc
 #Alt: smuxi
 #Alt: xchat
 #Alt: weechat
 #Alt: ekg2

-# voip/videoconference
+#Section: VoIP/videoconference
 #Description: mumble
 mumble
 #Alt: ring
 #Alt: linphone
 #ekiga #stretch only

-# mail clients
+#Section: Mail clients
 #Description: thunderbird
 thunderbird
 thunderbird-l10n-fr
@@ -64,7 +62,7 @@ thunderbird-l10n-fr
 #mail-notification-evolution #stretch only
 #Alt: offlineimap

-# file transfer and synchronization
+#Section: File transfer and synchronization
 #Description: nextcloud-desktop
 nextcloud-desktop
 rsync
@@ -82,9 +80,10 @@ rsync
 #Alt: filezilla
 #Alt: gftp
 #Alt: owncloud-client
+#Alt: pastebinit


-# bittorrent
+#Section: Bittorrent
 #Firewall: transmission bittorrent client
 #Description: transmission-gtk
 transmission-gtk
@@ -104,7 +103,7 @@ transmission-cli
 #Alt: rtorrent
 #Alt: btfs

-# multimedia download
+#Section: Media download
 #Description: youtube-dl
 youtube-dl
 streamlink
@@ -113,7 +112,7 @@ streamlink
 #Alt: minitube
 #Alt: smtube

-# web crawlers/downloaders
+#Section: Downloaders/web crawlers
 curl
 wget
 #Alt: httrack
@@ -121,7 +120,7 @@ wget
 #Alt: axel
 #Alt: plowshare

-# feed readers
+#Section: Feed readers
 #Description: liferea
 liferea
 dconf-gsettings-backend
@@ -133,22 +132,17 @@ dconf-gsettings-backend
 #Alt: tickr
 #Alt: feedreader

-# LAN file sharing
+#Section: LAN file sharing
 ##Firewall: samba server
 #Alt: samba
 #Alt: samba-vfs-modules 
 #Alt: smbclient
 #Alt: smbc

-
-#########################################
-
-# network management
+#Section: Network management
 #Description: network-manager-gnome
 network-manager-gnome
 network-manager-openvpn-gnome
-crda
-wireless-regdb
 dnsmasq-base
 hostname
 bridge-utils
@@ -160,11 +154,16 @@ ethtool
 #Alt: wicd-curses
 #Alt: wpagui
 #Alt: network-manager-ssh
-#Alt: network-manager-iodine-gnome
 #Alt: efax-gtk
 #Alt: wammu
+#Alt: avahi-daemon
+#Alt: libnss-mdns
+#Alt: avahi-autoipd
+#Alt: avahi-dnsconfd
+#Alt: avahi-discover
+#Alt: avahi-ui-utils

-# cellphone and modem support
+#Section: Cellphone and modem support
 #Alt: modemmanager
 #Alt: modem-manager-gui
 #Alt: mobile-broadband-provider-info
@@ -172,17 +171,23 @@ ethtool
 #Alt: gnome-phone-manager
 #Alt: kdeconnect

-# bluetooth
+#Section: Wireless
 #Description: blueman
 blueman
 bluetooth
 blueman
+crda
+wireless-regdb
 #Alt: gnome-bluetooth
 #Alt: gnome-user-share
 #Alt: blueproximity
 #Alt: ganyremote
+#Alt: hostapd
+#Alt: aircrack-ng
+#Alt: btscanner

-# firewall management
+
+#Section: Firewall
 #Description: gufw
 ufw
 gufw
@@ -193,15 +198,7 @@ iptables
 #Alt: fail2ban
 #Alt: ipset-persistent

-# avahi zero-configuration/uPnP/mDNS 
-#Alt: avahi-daemon
-#Alt: libnss-mdns
-#Alt: avahi-autoipd
-#Alt: avahi-dnsconfd
-#Alt: avahi-discover
-#Alt: avahi-ui-utils
-
-# network diagnostic/monitoring/utilities
+#Section: Network diagnostic/monitoring
 #Description: gnome-nettool
 gnome-nettool
 traceroute
@@ -252,16 +249,18 @@ dnsutils
 #Alt: vnstat
 #Alt: vnstati
 #Alt: wireshark
+#Alt: python-scapy
 #dropwatch #sid only

-# SSH
+#Section: SSH
 #Alt: sshuttle
 #Alt: sshfs
 #Alt: pssh
 #Alt: putty-tools
 #Alt: autossh
+#endlessh #sid only

-# remote access/remote desktop clients
+#Section: Remote access/desktop clients
 #Alt: remmina
 #Alt: remmina-plugin-nx
 #Alt: remmina-plugin-rdp
@@ -272,9 +271,8 @@ dnsutils
 #Alt: vinagre
 #Alt: weevely
 #Alt: x2goclient
-#Alt: gwakeonlan

-# ssh/remote access servers
+#Section: SSH
 #Firewall: SSH server
 #Description: openssh-server
 openssh-server
@@ -291,11 +289,11 @@ openssh-server
 #Alt: tinysshd
 #Alt: vino

-# Load testing
+#Section: Load testing
 #Alt: siege
 #Alt: tsung

-# Scanners
+#Section: Scanners
 #Alt: nmap
 #Alt: nikto
 #Alt: zmap
@@ -316,55 +314,37 @@ openssh-server
 #Alt: wafw00f
 #Alt: smbmap
 #Alt: wig
-#dnsmap #sid only
-#dnsenum #sid only
-
-# Wireless
-#Alt: aircrack-ng
 #Alt: kismet
 #Alt: kismet-plugins
 #Alt: reaver
-#Alt: python-scapy
-#Alt: btscanner
-#Alt: hostapd
-#Alt: mdk3
-#mdk4 #sid only
-
-# Passwords
 #Alt: hydra
 #Alt: pcredz
 #Alt: hydra-gtk
 #Alt: ophcrack
 #Alt: hashcat
 #Alt: hashcat-data
+#Alt: mdk3
+#dnsmap #sid only
+#dnsenum #sid only

-# Hardening/cryptography
-#Alt: tcplay
-#Alt: tomb
-#Alt: zulucrypt-gui
-#Alt: zulumount-gui
-#Alt: libzulucrypt-plugins
-#tails-installer #stretch only
+#Section: Tor
 #Alt: tor-geoipdb
-#endlessh #sid only
+#Alt: tor
+#Alt: torsocks
+#tails-installer #stretch only
+#torbrowser-launcher #stretch only

-# GeoIP databases
+#Section: GeoIP databases
 #Alt: geoip-bin
 #geoip-database-contrib #stretch only
 #geoip-database #conflicts with above
 #geoip-database-extra #conflicts with above

-# Network modeling
+#Section: Network modeling
 #Alt: marionnet
 #gns3 #stretch only

-# Out-of-band management
+#Section: Out-of-band management
 #Alt: ipmitool
+#Alt: gwakeonlan

-# Tor
-#Alt: tor
-#Alt: torsocks
-#torbrowser-launcher #stretch only
-
-# misc
-#Alt: pastebinit
--- a/config/package-lists/office.list.chroot
+++ b/config/package-lists/office.list.chroot
@@ -1,4 +1,6 @@
-# office suite
+#Title: Office
+
+#Section: Office suite
 #Description: libreoffice
 libreoffice-writer
 libreoffice-impress
@@ -13,7 +15,6 @@ libreoffice-gnome
 libreoffice-avmedia-backend-gstreamer
 libreoffice-avmedia-backend-vlc
 libwmf-bin
-# Localization
 hyphen-fr
 libreoffice-l10n-fr
 mythes-fr
@@ -46,7 +47,7 @@ libreoffice-help-fr
 #calligraflow #stretch only
 #plume-creator #stretch only

-# calendars/contacts management
+# Section: Calendars/contacts management
 # Description: lightning
 lightning
 lightning-l10n-fr
@@ -56,7 +57,7 @@ lightning-l10n-fr
 #Alt: abook
 #Alt: orage

-# finance managemenet
+#Section: Personal finance
 #Description: homebank
 homebank
 #Alt: gnucash
@@ -64,7 +65,7 @@ homebank
 #bitcoin-qt #sid only
 #electrum #bullseye only

-# document viewers
+#Section: Document viewers
 #Description: evince
 evince
 #Alt: mupdf
@@ -77,13 +78,13 @@ evince
 #Alt: yelp
 #Alt: xchm

-# e-book readers
+#Section: E-book
 #Alt: calibre
 #griffith #stretch only
 #gcstar #stretch only
 #Alt: cdcat

-# PDF editor/utilities
+#Section: PDF editor/utilities
 #Description: pdfchain
 pdfchain
 pdfgrep
@@ -102,14 +103,8 @@ poppler-utils
 #Alt: chm2pdf
 #pdfproctools #sid only

-# Sticky notes
-#Description: xfce4-notes
-xfce4-notes
-#Alt: xpad
-#tomboy #stretch only
-#Alt: gnote

-# Notebooks/Tasks/Personal information managers
+#Section: Tasks/Personal information management
 #Alt: osmo
 #Alt: zim
 #Alt: tasque
@@ -140,7 +135,7 @@ xfce4-notes
 #Alt: almanah
 #Alt: nixnote2

-# image scanning
+#Section: Image scanning
 #Description: simple-scan
 simple-scan
 imagemagick
@@ -149,14 +144,14 @@ sane-utils
 #Alt: scanbd
 #Alt: xsane

-# Optical Character Recognition (OCR)
+#Section: Optical Character Recognition (OCR)
 #Alt: ocrfeeder
 #Alt: tesseract-ocr-fra
 #Alt: unpaper
 #Alt: yagf
 #Alt: ocrad

-# printing
+#Section: Printing
 #Description: system-config-printer
 cups
 cups-client
@@ -172,10 +167,8 @@ cups-browsed
 #Alt: mtink
 #Alt: colord

-
-
-
-# fonts
+#Section: Fonts
+#Description: fonts-hack-ttf
 fonts-pecita
 fonts-beteckna
 fonts-breip
--- a/config/package-lists/system.list.chroot
+++ b/config/package-lists/system.list.chroot
@@ -1,6 +1,7 @@
-# package management
+#Title: System
+
+#Section: Package management
 #Description: gnome-packagekit
-#Description: aptitude
 #Description: synaptic
 apt-listchanges
 apt-transport-https
@@ -34,7 +35,7 @@ vrms
 #Alt: packagekit-gtk3-module
 #Alt: pk-update-icon

-# task management/monitoring/benchmarks
+#Section: Task management/monitoring
 #Description: xfce4-taskmanager
 xfce4-taskmanager
 htop
@@ -63,10 +64,11 @@ memtest86+
 #Alt: sysstat
 #Alt: cacti
 #Alt: hwloc
+#Alt: memlockd
 #Alt: read-edid
 #cpu-x #sid only

-# Backup utilities
+#Section: Backup
 #Description: backintime-qt4
 backintime-qt4
 #Alt: duplicity
@@ -84,18 +86,15 @@ backintime-qt4
 #Alt: backupninja
 #Alt: duply

-# Other
-#Alt: memlockd
-#Alt: bilibop-udev
-#Alt: forensics-full
-#Alt: steghide
-
-# disk/filesystem management
-# Description: gnome-disk-utility
-gnome-disk-utility
+#Section: Disk management
+#Description: gnome-disk-utility
 #Description: gparted
+#Description: baobab
+gnome-disk-utility
 gparted
-cryptsetup
+baobab
+ncdu
+dfc
 smartmontools
 mtools
 gdisk
@@ -112,17 +111,16 @@ xorriso
 #Alt: fsarchiver
 #Alt: partclone
 #Alt: pmount
+#Alt: bilibop-udev
 #ecryptfs-utils #stretch only
 #partimage #stretch only
-
-# disk space analyzers
-#Description: baobab
-baobab
-ncdu
-dfc
+#Alt: forensics-full
+#Alt: steghide
 #Alt: gdmap

-# data recovery
+
+#Section: data recovery
+#Description: testdisk
 testdisk
 #Alt: foremost
 #Alt: scalpel
@@ -132,13 +130,13 @@ testdisk
 #Alt: fatcat
 #Alt: safecopy

-# filesystem linters
+#Section: File cleaners/linters
 #Description: bleachbit
 bleachbit
 localepurge
 #Alt: fslint

-# log viewers
+#Section: Log viewers
 #Description: lnav
 lnav
 colortail
@@ -149,7 +147,7 @@ colortail
 #Alt: multitail


-# virtualization
+#Section: Virtualization
 #Description: virt-manager
 virt-manager
 virtinst
@@ -174,11 +172,10 @@ netcat-openbsd
 #Alt: vagrant
 #Alt: schroot

-# windows compatibility
+#Section: Windows compatibility
 #Description: wine
 wine
 #if ARCHITECTURES amd64
-wine32
 wine64
 wine32:i386
 libgl1-mesa-dri:i386
@@ -190,65 +187,56 @@ libgl1-mesa-dri:i386
 #Alt: dxvk
 #Alt: reglookup

-
-# configuration management
+#Section: configuration management
 #Alt: ansible

-# java runtime
+#Section: Java
 default-jre

-# display manager
+#Section: Display manager and screen lockr
 #Description: lightdm
+#Description: light-locker
 lightdm
 lightdm-gtk-greeter
+light-locker
 #Alt: slim
 #Alt: gdm3
 #Alt: arctica-greeter
-
-# screen locker
-light-locker
 #xsecurelock #bullseye only
 #Alt: xscreensaver
 #Alt: xscreensaver-data-extra
 #Alt: xscreensaver-gl
 #Alt: xscreensaver-gl-extra

-# Boot screen
+#Section: Boot screen
 plymouth
 plymouth-x11

-# Boot/init/permissions management
-systemd
-os-prober
-initramfs-tools
-console-setup
-user-setup
-libpam-systemd
-sudo

-# scheduling
+#Section: Scheduling
 at

-# Desktop performance
+#Section: Desktop performance
 ulatencyd
 irqbalance
 #Alt: haveged
 #oomd #bullseye only
 #preload #stretch only

-# sandboxing/isolation
+#Section: Security & sandboxing
 apparmor
 apparmor-easyprof
 apparmor-profiles
 apparmor-utils
 libpam-tmpdir
+sudo
 #Alt: apparmor-notify
 #Alt: apparmor-profiles-extra

-# Time
+#Section: Time
 ntp

-# display server
+#Section: Display
 #Description: xorg
 mesa-utils
 libgl1-mesa-dri
@@ -276,25 +264,31 @@ xserver-xorg-video-intel
 xfonts-base
 hwdata

-# Kernel
+#Section: Kernel/boot/init
 #if ARCHITECTURES amd64
 linux-headers-amd64
 #endif
 #if ARCHITECTURES i386
-linux-headers-amd64
+linux-headers-686:i386
 #endif
 module-assistant
 dkms
 build-essential
+systemd
+os-prober
+initramfs-tools
+console-setup
+user-setup
+libpam-systemd
 #Alt: kexec-tools

-# Firmwares
+#Section: Firmwares
 firmware-linux-free
 firmware-linux-nonfree
 amd64-microcode
 intel-microcode

-# Hardware-specific packages
+#Section: Hardware-specific packages
 #Alt: driverctl
 #Alt: pommed
 #Alt: lomoco
@@ -302,7 +296,7 @@ intel-microcode
 #Alt: mbpfan
 #Alt: usbmuxd

-# live system components
+#Section: Live system components
 live-boot
 live-config
 live-config-systemd
--- a/config/package-lists/utility.list.chroot
+++ b/config/package-lists/utility.list.chroot
@@ -1,4 +1,6 @@
-# file management
+#Title: Utility
+
+#Section: File management
 #Description: thunar
 #cfv #sid only
 gvfs-backends
@@ -41,13 +43,22 @@ catfish
 #Alt: reflex
 #Alt: fzf
 #Alt: ripgrep
-#Alt: gnome-search-tool


-
-# launcher/application menu
+#Section: Desktop environment
+#Description: xfce4
+xfdesktop4
+xfwm4
+xfce4-session
+xfce4-notifyd
 xfce4-whiskermenu-plugin
 gmrun
+xfce4-panel
+xfce4-places-plugin
+xfce4-weather-plugin
+xfce4-netload-plugin
+xfce4-pulseaudio-plugin
+#Alt: plank
 #Alt: kupfer
 #Alt: gnome-pie
 #Alt: xfce4-appfinder
@@ -55,12 +66,6 @@ gmrun
 #Alt: zeitgeist
 #Alt: zeitgeist-datahub
 #Alt: activity-log-manager
-
-# desktop/wm/session/panel
-xfdesktop4
-xfwm4
-xfce4-session
-xfce4-notifyd
 #Alt: compiz
 #Alt: compiz-plugins
 #Alt: compiz-plugins-default
@@ -69,16 +74,8 @@ xfce4-notifyd
 #Alt: compton
 #Alt: compton-conf

-# panel
-xfce4-panel
-xfce4-places-plugin
-xfce4-weather-plugin
-xfce4-netload-plugin
-xfce4-pulseaudio-plugin
-#Alt: plank

-
-# archive management
+#Section: Archive management
 #Description: file-roller
 file-roller
 atool
@@ -105,7 +102,7 @@ gzrt
 #Alt: p7zip-rar


-# password and keys management
+#Section: Password management/file encryption
 #Description: keepassxc
 keepassxc
 seahorse
@@ -117,19 +114,25 @@ gnupg
 gnupg2
 pwgen
 nss-passwords
-
+cryptsetup
 #Alt: keepassx
 #Alt: keepass2
 #Alt: qtpass
 #revelation #stretch only
 #Alt: apg
+#Alt: tcplay
 #Alt: xkcdpass
 #Alt: pass
+#Alt: tomb
+#Alt: zulucrypt-gui
+#Alt: zulumount-gui
+#Alt: libzulucrypt-plugins

-# text editors
+
+#Section: text editors
 #Description: mousepad
-mousepad
 #Description: nano
+mousepad
 nano
 vim-tiny
 #Alt: vim
@@ -143,7 +146,15 @@ vim-tiny
 #Alt: geany
 #Alt: nfoview

-# maps
+#Section: Sticky notes
+#Description: xfce4-notes
+xfce4-notes
+#Alt: xpad
+#tomboy #stretch only
+#Alt: gnote
+
+
+#Section: maps
 #Description: gnome-maps
 gnome-maps
 #Alt: marble-qt
@@ -159,14 +170,14 @@ gnome-maps
 #Alt: gis-tasks
 #Alt: gpsprune

-# screenshots
+#Section: screenshots
 #Description: xfce4-screenshooter
 xfce4-screenshooter
 #Alt: scrot
 #Alt: gnome-screenshot
 #Alt: flameshot

-# clocks/timers
+#Section: clocks/timers
 #Description: gnome-clocks
 gnome-clocks
 tty-clock
@@ -177,7 +188,7 @@ tty-clock
 #screenruler #stretch only


-# calculators
+#Section: calculators
 #Description: gnome-calculator
 #Screenshot: gnome-calculator
 gnome-calculator
@@ -189,7 +200,7 @@ units
 #Alt: gbase
 #Alt: graphmonkey

-# terminal emulators
+#Section: terminal emulators
 #Description: xfce4-terminal
 xfce4-terminal
 #Alt: lxterminal
@@ -199,26 +210,26 @@ xfce4-terminal
 #Alt: rxvt-unicode
 #Alt: tilda

-# science
+#Section: science
 #Alt: stellarium
 #Alt: lightspeed
 #Alt: wxmaxima
 #Alt: gramps

-# color management
+#Section: color management
 #Description: redshift-gtk
 redshift-gtk
 #Alt: workrave
 #Alt: safeeyes

-# CD burning
+#Section: CD burning
 #Description: xfburn
 xfburn
 #Alt: brasero
 #Alt: brasero-cdrkit
 #Alt: cdrdao

-# Desktop configuration utilities
+#Section: Desktop configuration utilities
 xfce4-settings
 gnome-system-tools
 menulibre
@@ -230,7 +241,7 @@ gnome-settings-daemon
 dconf-gsettings-backend
 #Alt: gnome-tweaks

-# power management
+#Section: power management
 #Description: xfce4-power-manager
 xfce4-power-manager
 xfce4-battery-plugin
@@ -257,12 +268,12 @@ pm-utils
 #hd-idle #bullseye only
 #eeepc-acpi-scripts #sid only

-# character map/font viewer
+#Section: character map/font viewer
 gucharmap
 gnome-font-viewer
 #Alt: font-manager

-# spell checking/dictionaries
+#Section: spell checking/dictionaries
 hunspell
 hunspell-en-us
 hunspell-fr
@@ -279,7 +290,7 @@ wfrench
 #Alt: goldendict
 #Alt: verbiste-gnome

-# Resources
+#Section: Resources
 desktop-base
 papirus-icon-theme
 arc-theme
@@ -290,14 +301,13 @@ gnome-audio
 #Alt: clearlooks-phenix-theme
 #Alt: deepin-icon-theme

-
-# virtual keyboards
+#Section: virtual keyboards
 #Alt: onboard
 #Alt: onboard-data
 #Alt: cellwriter
 #Alt: florence

-# other/misc
+#Section: other/misc
 libnotify-bin
 zenity
 numlockx