2 files changed, 112 insertions, 100 deletions

diff --git a/profiles/amd64-desktop/package.accept_keywords b/profiles/amd64-desktop/package.accept_keywords
index f25fb9b..dd4595d 100644
--- a/profiles/amd64-desktop/package.accept_keywords
+++ b/profiles/amd64-desktop/package.accept_keywords
@@ -1,50 +1,66 @@
-# misc
-app-misc/keyd ~amd64
+#---------#
+# Various #
+#---------#
 app-eselect/eselect-autostart ~amd64
+app-misc/keyd ~amd64
 
-# emacs
-app-editors/emacs ~amd64
+#-----------#
+# Languages #
+#-----------#
+dev-lang/zig ~amd64
+dev-zig/zls ~amd64
 
-# droidcam
-media-video/droidcam ~amd64
+#---------#
+# Desktop #
+#---------#
 
-# shell utils
+#   +-----------+
+#   | Utilities |
+#   +-----------+
 gnome-extra/yad ~amd64
-net-misc/inetutils ~amd64
 
-# zig
-dev-lang/zig ~amd64
-dev-zig/zls ~amd64
+#   +-------------+
+#   | Development |
+#   +-------------+
+app-editors/emacs ~amd64
 
-# wayland base
+#   +---------+
+#   | Wayland |
+#   +---------+
+#--- base ---#
 dev-libs/wayland ~amd64
 dev-util/wayland-scanner ~amd64
-
-# labwc
+#--- labwc ---#
 gui-libs/wlroots ~amd64
 gui-wm/labwc ~amd64
 dev-libs/libsfdo ~amd64
-
-# wayland programs
 gui-apps/rofi-wayland ~amd64
 gui-apps/wf-recorder ~amd64
 gui-apps/swaylock-effects ~amd64
 gui-apps/swaylock-plugin ~amd64
-
-# wayland utils
 gui-apps/wlr-randr ~amd64
 gui-apps/wev ~amd64
 gui-apps/wtype ~amd64
 gui-apps/wlopm ~amd64
 gui-apps/wlsunset ~amd64
 
-# mozilla
+#   +------+
+#   | XFCE |
+#   +------+
+x11-themes/elementary-xfce-icon-theme ~amd64
+
+#   +----------+
+#   | Internet |
+#   +----------+
 www-client/firefox ~amd64
 mail-client/thunderbird ~amd64
-dev-libs/nss ~amd64
 
-# xfce
-x11-themes/elementary-xfce-icon-theme ~amd64
-
-# fonts
+#   +-------+
+#   | Fonts |
+#   +-------+
 media-fonts/nerdfonts ~amd64
+
+#   +------------+
+#   | Multimedia |
+#   +------------+
+media-video/droidcam ~amd64
diff --git a/profiles/amd64-desktop/package.use b/profiles/amd64-desktop/package.use
index ef96eec..73d85d3 100644
--- a/profiles/amd64-desktop/package.use
+++ b/profiles/amd64-desktop/package.use
@@ -1,126 +1,122 @@
-# portage: enable doc and gentoo-dev
+#--------#
+# Gentoo #
+#--------#
 sys-apps/portage doc gentoo-dev
 
-# kernel: use savedconfig over initramfs
+#---------------#
+# Kernel & Boot #
+#---------------#
 sys-kernel/gentoo-kernel savedconfig -initramfs
 sys-kernel/linux-firmware -initramfs
 sys-firmware/intel-microcode -initramfs
-
-# systemd: use systemd-boot
 sys-apps/systemd boot kernel-install
 sys-kernel/installkernel systemd-boot
 
-# fuse: needs suid
-sys-fs/fuse suid
-
-# sudo: use offensive
-app-admin/sudo offensive
-
-# nm: disable wireless extensions (obsolete)
+#---------#
+# Network #
+#---------#
+#---- wext are deprecated ---#
 net-misc/networkmanager -wext
-
-# ppp: disable gtk frontend
+#---- 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-misc/inetutils telnet traceroute whois ftp
 
-# cups: enable avahi printer discovery
-net-print/cups zeroconf
+#-----------#
+# Languages #
+#-----------#
+net-libs/nodejs npm
+dev-lang/zig doc
+dev-lang/rust system-llvm
 
-# libpcre: enable jit
+#---------#
+# Various #
+#---------#
 dev-libs/libpcre jit
 dev-libs/libpcre2 jit
+sys-fs/fuse suid
+app-admin/sudo offensive
 
-# ca-certificates: include certs from CAcert
-app-misc/ca-certificates cacert
-dev-libs/nss cacert
-
-# libreoffice: use gtk3 (gtk4 requires X for some reason)
-app-office/libreoffice gtk3
+#---------#
+# Desktop #
+#---------#
 
-# transmission
-net-p2p/transmission appindicator cli gtk
-# inetutils: basic inet utils
-net-misc/inetutils telnet traceroute whois ftp
-# hexchat
-net-irc/hexchat gtk lua libcanberra
-
-# nodejs: enable npm
-net-libs/nodejs npm
+#   +-----------+
+#   | Utilities |
+#   +-----------+
+gnome-extra/yad -webkit
 
-# emacs: enable gui with gtk
-app-editors/emacs gui gtk
-# emacs: enable tree-sitter support
-app-editors/emacs tree-sitter
-# emacs: enable support for various image formats
-app-editors/emacs svg webp gif imagemagick png
-# emacs: enable builtin xml parsing
-app-editors/emacs libxml2
-# emacs: enable SQL support (required by org-roame)
+#   +-------------+
+#   | Development |
+#   +-------------+
+app-editors/emacs gui gtk tree-sitter source svg webp gif imagemagick png libxml2 source
+#--- SQL support (required by org-roam)
 app-editors/emacs sqlite
-# emacs: enable JIT compilation for .el files
+#--- jit
 app-editors/emacs jit
 sys-devel/gcc jit
-# emacs: third party support
+#--- third party programs
 net-mail/notmuch emacs
 app-crypt/pinentry emacs
 dev-libs/protobuf emacs
 dev-util/pkgcheck emacs
 app-admin/eselect emacs
 
-# zig: fetch the documentation for offline use
-dev-lang/zig doc
-
-# rust: use system-llvm
-dev-lang/rust system-llvm
-
-# mozilla: use system libraries, hwaccel
-www-client/firefox system-av1 system-harfbuzz system-icu system-jpeg system-libevent system-libvpx system-pipewire system-webp hwaccel
-mail-client/thunderbird system-av1 system-harfbuzz system-jpeg system-libevent system-librnp system-libvpx system-webp system-pipewire hwaccel
-
-# droidcam: enable gtk3 frontend
-media-video/droidcam gtk
-dev-libs/libdbusmenu gtk3
+#   +----------+
+#   | Internet |
+#   +----------+
+www-client/firefox system-av1 system-harfbuzz system-icu system-jpeg system-libevent system-libvpx system-pipewire system-webp
+www-client/firefox hwaccel
+mail-client/thunderbird system-av1 system-harfbuzz system-jpeg system-libevent system-librnp system-libvpx system-webp system-pipewire
+mail-client/thunderbird hwaccel
+net-p2p/transmission appindicator cli gtk
 
-# mpv: enable CLI tools and archive support
+#   +------------+
+#   | Multimedia |
+#   +------------+
 media-video/mpv tools archive
-
-# yad: disable webkit (brings webkit-gtk)
-gnome-extra/yad -webkit
-
-# pipewire/pulseaudio
 media-video/pipewire echo-cancel extra jack-sdk v4l sound-server flatpak pipewire-alsa
 media-libs/libcanberra pulseaudio
+media-video/droidcam gtk
+dev-libs/libdbusmenu gtk3
 
-# inkscape: enable support for newer svg2 format
+#   +--------+
+#   | Office |
+#   +--------+
+app-office/libreoffice gtk3
 media-gfx/inkscape svg2
 
-# nerdfonts:
+#   +-------+
+#   | Fonts |
+#   +-------+
 media-fonts/nerdfonts bigblueterminal terminus liberationmono noto inconsolata hack
 
-# xfce-meta: enable image, svg, power management, archive, calendar and pulseaudio support
+#   +------+
+#   | XFCE |
+#   +------+
 xfce-base/xfce4-meta image svg upower archive calendar pulseaudio
 xfce-base/xfce4-settings libcanberra -xklavier
-# xfce4-pulseaudio-plugin: disable keybinder (doesn’t work on wayland)
 xfce-extra/xfce4-pulseaudio-plugin libcanberra -keybinder
-# xfdesktop: enable X support (doesn't build properly without it)
+xfce-base/libxfce4ui system-info
+#--- xfdesktop needs X to build properly
 xfce-base/xfdesktop X
 xfce-base/libxfce4ui X
 xfce-base/libxfce4windowing X
-# xfce4ui: enable system-info menu in settings
-xfce-base/libxfce4ui system-info
 
-# labwc: enable Xwayland
+#   +---------+
+#   | Wayland |
+#   +---------+
 gui-wm/labwc X
 gui-libs/wlroots X
-# wlroots: enable xcb-errors (better error reporting for Xwayland)
 gui-libs/wlroots xcb-errors
-
-# swaybg: enable gdk-pixbuf (allows more image formats)
 gui-apps/swaybg gdk-pixbuf
 
-# nm-applet: enable appindicator support
-gnome-extra/nm-applet appindicator
-
-# X: enable X support for apps still running under X
+#   +-----+
+#   | X11 |
+#   +-----+
 sys-apps/dbus X
 media-libs/libepoxy X
 media-libs/libglvnd X