sets: large refactoring

diff --git a/sets.conf b/sets.conf
index 7de0a17d2dd249d6a63d152fca4f47e65cafb762..be01b63d39e381022c2c9bbc2952518bcbd05831 100644 (file)
--- a/sets.conf
+++ b/sets.conf
@@ -1,6 +1,6 @@
 [orf-world]
 class = portage.sets.base.DummyPackageSet
-packages = @orf-desktop @orf-dev @orf-emacs @orf-fonts @orf-inet @orf-media @orf-system @orf-world @orf-xfce @orf-zig
+packages = @orf-core @orf-desktop @orf-dev @orf-emacs @orf-fonts @orf-programs @orf-xfce @orf-zig
 
 [orf sets]
 class = portage.sets.files.StaticFileSet

diff --git a/sets/orf-system b/sets/orf-core
similarity index 78%
rename from sets/orf-system
rename to sets/orf-core
index 55acae6a7373b2cb29cce860437654f03ae359f1..40c4ef22cae740d5a186f3d11dcf8adcc48a71b1 100644 (file)
--- a/sets/orf-system
+++ b/sets/orf-core
@@ -1,21 +1,25 @@
-#--- gentoo
+#--------#
+# Gentoo #
+#--------#
 app-eselect/eselect-repository
 app-portage/eix
 app-portage/gentoolkit
 app-portage/mirrorselect
 app-portage/pfl
 
-#--- system
+#--------#
+# System #
+#--------#
 app-admin/eclean-kernel
 app-admin/sudo
+app-misc/keyd
 net-misc/networkmanager
 sys-kernel/linux-firmware
-sys-process/systemd-cron
 
-#--- utils
+#-------#
+# Utils #
+#-------#
 app-admin/stow
-app-editors/neovim
-app-misc/keyd
 app-misc/tmux
 app-shells/fish
 app-text/tree

diff --git a/sets/orf-desktop b/sets/orf-desktop
index d397bd4652925388ff8ac98d465c814a0b2003ba..4c4ec9ece6a84ea2b34a47d38ef62d9d89166f3c 100644 (file)
--- a/sets/orf-desktop
+++ b/sets/orf-desktop
@@ -1,18 +1,34 @@
+#------------#
+# Compositor #
+#------------#
 gui-wm/labwc::orf-overlay
-app-eselect/eselect-autostart
-gnome-extra/yad
-gui-apps/rofi-wayland
+
+#---------------#
+# GUI Utilities #
+#---------------#
 gui-apps/swaybg
-gui-apps/swayidle
 gui-apps/swaylock-effects
-gui-apps/wev
-gui-apps/wl-clipboard
-gui-apps/wlopm
-gui-apps/wlr-randr
 gui-apps/wlsunset
 gui-libs/xdg-desktop-portal-wlr
 sys-apps/xdg-desktop-portal-gtk
-x11-apps/xeyes
-x11-misc/dex
+gnome-extra/yad
+gui-apps/rofi-wayland
+gui-apps/grim
+gui-apps/slurp
+gui-apps/swappy
+gui-apps/wf-recorder
+
+#---------------#
+# CLI Utilities #
+#---------------#
 x11-misc/xdg-user-dirs
-sys-apps/flatpak
+x11-misc/dex
+app-eselect/eselect-autostart
+gui-apps/wl-clipboard
+
+#-----------#
+# Debugging #
+#-----------#
+gui-apps/wev
+x11-apps/xeyes
+gui-apps/wlr-randr

diff --git a/sets/orf-dev b/sets/orf-dev
index f05abe7f8c386a3dd0a68b90c0175513c22eb444..a70b5e19ecfe445792a60669b3a4210248ab0b49 100644 (file)
--- a/sets/orf-dev
+++ b/sets/orf-dev
@@ -1,8 +1,19 @@
+#-----------#
+# Debugging #
+#-----------#
 dev-debug/gdb
 dev-debug/strace
+dev-debug/valgrind
+
+#-----------#
+# Utilities #
+#-----------#
 dev-util/bear
 dev-util/ccache
 dev-util/ctags
 dev-util/pkgdev
-dev-vcs/git
 
+#-----#
+# VCS #
+#-----#
+dev-vcs/git

diff --git a/sets/orf-fonts b/sets/orf-fonts
index 663823864b0d22faf698dc27edab9dc8260dea7f..35201208b3304804d7bd354d3ebb65944b154207 100644 (file)
--- a/sets/orf-fonts
+++ b/sets/orf-fonts
@@ -2,3 +2,4 @@ media-fonts/noto-emoji
 media-fonts/noto-cjk
 media-fonts/liberation-fonts
 media-fonts/unifont
+media-fonts/nerdfonts

diff --git a/sets/orf-inet b/sets/orf-inet
deleted file mode 100644 (file)
index 1cbff7a..0000000
--- a/sets/orf-inet
+++ /dev/null
@@ -1,13 +0,0 @@
-mail-client/thunderbird:0/stable
-net-dns/bind-tools
-net-im/signal-desktop-bin
-net-irc/hexchat
-net-mail/isync
-net-mail/notmuch
-net-misc/inetutils
-net-misc/yt-dlp
-net-p2p/transmission
-net-vpn/networkmanager-openvpn
-net-vpn/networkmanager-pptp
-net-vpn/tor
-www-client/firefox:rapid

diff --git a/sets/orf-media b/sets/orf-media
deleted file mode 100644 (file)
index 99506a1..0000000
--- a/sets/orf-media
+++ /dev/null
@@ -1,9 +0,0 @@
-gui-apps/grim
-gui-apps/slurp
-gui-apps/swappy
-gui-apps/wf-recorder
-media-gfx/gimp
-media-gfx/inkscape
-media-sound/pavucontrol
-media-video/mpv
-media-video/wireplumber

diff --git a/sets/orf-programs b/sets/orf-programs
new file mode 100644 (file)
index 0000000..11a0fee
--- /dev/null
+++ b/sets/orf-programs
@@ -0,0 +1,29 @@
+#------------------#
+# GUI Applications #
+#------------------#
+www-client/firefox:rapid
+mail-client/thunderbird:0/stable
+net-im/signal-desktop-bin
+sys-apps/flatpak
+media-sound/pavucontrol
+media-video/mpv
+media-gfx/gimp
+media-gfx/inkscape
+net-p2p/transmission
+net-irc/hexchat
+app-emulation/virt-manager
+app-emulation/wine-vanilla
+
+#-----------#
+# CLI Tools #
+#-----------#
+net-dns/bind-tools
+net-misc/inetutils
+net-misc/yt-dlp
+
+#--------#
+# Extras #
+#--------#
+net-vpn/networkmanager-openvpn
+net-vpn/networkmanager-pptp
+net-vpn/tor

diff --git a/sets/orf-xfce b/sets/orf-xfce
index 54185e59ce820742b797d50a258f8850e7b1c8e1..3308a58d10c27894a3382289d457cf60875a6bb9 100644 (file)
--- a/sets/orf-xfce
+++ b/sets/orf-xfce
@@ -1,11 +1,24 @@
+#------#
+# Base #
+#------#
 xfce-base/xfce4-meta
+
+#--------------#
+# Applications #
+#--------------#
+xfce-extra/xfce4-taskmanager
+xfce-extra/xfce4-notifyd
+gnome-extra/nm-applet
+
+#---------#
+# Plugins #
+#---------#
 xfce-extra/xfce4-battery-plugin
 xfce-extra/xfce4-clipman-plugin
-xfce-extra/xfce4-docklike-plugin
-xfce-extra/xfce4-mount-plugin
-xfce-extra/xfce4-notifyd
-xfce-extra/xfce4-taskmanager
 xfce-extra/xfce4-whiskermenu-plugin
-gnome-extra/nm-applet
+
+#--------#
+# Themes #
+#--------#
 x11-themes/elementary-xfce-icon-theme
 x11-themes/greybird