+++ /dev/null
-#--------#
-# Gentoo #
-#--------#
-sys-apps/portage doc gentoo-dev
-
-#---------------#
-# Kernel & Boot #
-#---------------#
-sys-kernel/gentoo-kernel savedconfig
-sys-kernel/installkernel dracut systemd-boot
-sys-apps/systemd boot kernel-install
-app-admin/eclean-kernel zstd
-
-#---------#
-# Network #
-#---------#
-#--- wext are deprecated
-net-misc/networkmanager -wext
-#--- avahi printer discovery
-net-print/cups zeroconf
-app-misc/ca-certificates cacert
-dev-libs/nss cacert
-gnome-extra/nm-applet appindicator
-net-dialup/ppp -gtk
-net-dns/avahi -gtk
-net-wireless/wpa_supplicant -gui
-net-misc/inetutils telnet traceroute whois ftp ftpd
-
-#-----------#
-# Languages #
-#-----------#
-net-libs/nodejs npm
-dev-lang/zig doc
-dev-lang/rust system-llvm
-dev-debug/gdb debuginfod multitarget
-
-#---------#
-# Various #
-#---------#
-dev-libs/libpcre jit
-dev-libs/libpcre2 jit
-sys-fs/fuse suid
-app-admin/sudo offensive
-app-admin/doas persist
-app-crypt/pinentry -gtk
-
-#---------#
-# Desktop #
-#---------#
-
-# +-----------+
-# | Utilities |
-# +-----------+
-gnome-extra/yad -webkit
-
-# +-------------+
-# | Development |
-# +-------------+
-app-editors/emacs gui gtk tree-sitter source svg webp gif imagemagick png libxml2
-#--- Dynamic loading (required by vterm)
-app-editors/emacs dynamic-loading
-#--- SQL support (required by org-roam)
-app-editors/emacs sqlite
-#--- jit
-app-editors/emacs jit
-sys-devel/gcc jit
-#--- third party programs
-net-mail/mu4 emacs
-app-crypt/pinentry emacs
-dev-libs/protobuf emacs
-dev-util/pkgcheck emacs
-app-admin/eselect emacs
-
-# +----------+
-# | Internet |
-# +----------+
-www-client/firefox hwaccel system-av1 system-harfbuzz system-jpeg system-libevent system-libvpx system-pipewire system-webp system-icu
-mail-client/thunderbird hwaccel system-av1 system-harfbuzz system-jpeg system-libevent system-libvpx system-pipewire system-webp system-librnp
-net-p2p/transmission appindicator cli -gtk
-
-# +------------+
-# | Multimedia |
-# +------------+
-media-video/mpv tools archive
-media-video/pipewire echo-cancel extra jack-sdk v4l sound-server flatpak pipewire-alsa
-media-libs/libcanberra pulseaudio
-media-video/droidcam gtk
-media-video/ffmpeg opus
-
-# +--------+
-# | Office |
-# +--------+
-media-gfx/inkscape svg2
-kde-apps/okular markdown
-
-# +-------+
-# | Fonts |
-# +-------+
-media-fonts/nerdfonts terminus noto inconsolata gomono
-media-fonts/unifont ttf utils fontforge
-
-# +------+
-# | XFCE |
-# +------+
-xfce-base/xfce4-meta image svg upower archive calendar pulseaudio
-xfce-base/xfce4-settings libcanberra -xklavier
-xfce-extra/xfce4-pulseaudio-plugin libcanberra -keybinder
-xfce-base/libxfce4ui system-info
-#--- xfdesktop needs X to build properly
-xfce-base/xfdesktop X
-xfce-base/libxfce4ui X
-xfce-base/libxfce4windowing X
-
-# +--------+
-# | Plasma |
-# +--------+
-kde-plasma/plasma-workspace X -fontconfig
-kde-frameworks/kwindowsystem X
-dev-qt/qtbase X
-dev-qt/qtmultimedia X
-media-libs/gst-plugins-base X
-kde-plasma/plasma-meta kwallet oxygen-theme kwallet flatpak -sddm -display-manager -crash-handler
-
-# +---------+
-# | Wayland |
-# +---------+
-gui-wm/labwc X icons svg
-gui-wm/river man
-gui-libs/wlroots X
-gui-libs/wlroots xcb-errors
-gui-apps/swaybg gdk-pixbuf
-
-# +-----+
-# | X11 |
-# +-----+
-sys-apps/dbus X
-media-libs/libepoxy X
-media-libs/libglvnd X
-media-libs/mesa X
-x11-libs/libxkbcommon X
-x11-libs/pango X
-x11-libs/cairo X
-dev-python/pycairo X
-x11-libs/gtk+ X
-dev-cpp/cairomm X
-dev-cpp/gtkmm X
-dev-qt/qtgui X
--- /dev/null
+#--------#
+# System #
+#--------#
+sys-apps/systemd boot kernel-install
+sys-kernel/installkernel dracut systemd-boot
+app-admin/eclean-kernel zstd
+app-admin/doas persist
+app-admin/sudo offensive
+sys-apps/portage gentoo-dev
+
+#-----#
+# Dev #
+#-----#
+dev-lang/rust system-llvm
+dev-debug/gdb debuginfod multitarget
+app-editors/emacs gui tree-sitter source svg webp gif imagemagick png libxml2 jit sqlite dynamic-loading
+
+#-----#
+# KDE #
+#-----#
+kde-apps/ark zip
+kde-apps/okular markdown speech
+kde-plasma/plasma-meta kwallet flatpak -sddm -display-manager -crash-handler
+kde-plasma/plasma-workspace -fontconfig
+
+#---------#
+# Mozilla #
+#---------#
+mail-client/thunderbird hwaccel system-av1 system-harfbuzz system-jpeg system-libevent system-libvpx system-pipewire system-webp system-librnp
+www-client/firefox openh264 hwaccel system-av1 system-harfbuzz system-jpeg system-libevent system-libvpx system-pipewire system-webp system-icu -telemetry
+
+#-------#
+# Fonts #
+#-------#
+media-fonts/nerdfonts terminus noto inconsolata gomono
+
+#---------------#
+# Video & Audio #
+#---------------#
+media-video/ffmpeg opus
+media-video/mpv tools archive -dvd -cdda -pulseaudio
+media-video/pipewire echo-cancel extra jack-sdk v4l sound-server flatpak pipewire-alsa
+
+#-----#
+# Net #
+#-----#
+net-libs/nodejs system-icu npm -inspector
+net-misc/inetutils telnet traceroute whois ftp ftpd
+net-misc/networkmanager -wext
+net-p2p/transmission appindicator cli
+net-wireless/wpa_supplicant -gui
+gnome-extra/nm-applet appindicator
+
+#-----#
+# GUI #
+#-----#
+gnome-extra/yad -webkit
+gui-apps/swaybg gdk-pixbuf
+gui-libs/wlroots xcb-errors
+gui-wm/labwc icons