BREAKING: yet another set rework

diff --git a/sets.conf b/sets.conf
index be01b63d39e381022c2c9bbc2952518bcbd05831..77c8389261f63c822f44cef8be44c874f0802075 100644 (file)
--- a/sets.conf
+++ b/sets.conf
@@ -1,9 +1,5 @@
-[orf-world]
-class = portage.sets.base.DummyPackageSet
-packages = @orf-core @orf-desktop @orf-dev @orf-emacs @orf-fonts @orf-programs @orf-xfce @orf-zig
-
 [orf sets]
 class = portage.sets.files.StaticFileSet
 multiset = true
 directory = ${repository:orf-overlay}/sets/
-world-candidate = True
\ No newline at end of file
+world-candidate = True

diff --git a/sets/orf-bootstrap b/sets/orf-bootstrap
new file mode 100644 (file)
index 0000000..81f44a0
--- /dev/null
+++ b/sets/orf-bootstrap
@@ -0,0 +1,8 @@
+app-eselect/eselect-repository
+app-portage/eix
+app-portage/gentoolkit
+app-portage/mirrorselect
+app-editors/vim
+app-misc/tmux
+app-text/tree
+sys-process/btop

diff --git a/sets/orf-core b/sets/orf-core
index 9d9be17e51938c9bb9e46af8c4a465ae9381c716..6e1342c46b0966417128c4970a7613e3f43e62a2 100644 (file)
--- a/sets/orf-core
+++ b/sets/orf-core
@@ -1,31 +1,26 @@
-#--------#
-# Gentoo #
-#--------#
+#--------
+# Gentoo
+#--------
 app-eselect/eselect-repository
 app-portage/eix
 app-portage/gentoolkit
 app-portage/mirrorselect
 app-portage/pfl
 
-#--------#
-# System #
-#--------#
-sys-boot/grub
+#--------
+# System
+#--------
+app-admin/sysklogd
+sys-process/cronie
+app-admin/doas
 app-admin/eclean-kernel
-app-admin/sudo
 app-misc/keyd
-net-misc/networkmanager
-sys-kernel/linux-firmware
-
-#-------#
-# Utils #
-#-------#
-app-admin/stow
+app-editors/vim
 app-misc/tmux
-app-shells/fish
 app-text/tree
-sys-apps/fd
-sys-apps/ripgrep
-sys-fs/ncdu
+#--- ftp, traceroute and friends
+net-misc/inetutils
+#--- dig, dnslookup and friends
+net-dns/bind
 sys-process/btop
-sys-process/lsof
+sys-fs/ncdu

diff --git a/sets/orf-desktop b/sets/orf-desktop
index 4c4ec9ece6a84ea2b34a47d38ef62d9d89166f3c..c2276a4c03ae6bc8c6ba8eadedf9a33c89651f5f 100644 (file)
--- a/sets/orf-desktop
+++ b/sets/orf-desktop
@@ -1,11 +1,27 @@
-#------------#
-# Compositor #
-#------------#
+#------------
+# Compositor
+#------------
 gui-wm/labwc::orf-overlay
 
-#---------------#
-# GUI Utilities #
-#---------------#
+#---------------------
+# Desktop Environment
+#---------------------
+xfce-base/xfce4-meta
+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-whiskermenu-plugin
+xfce-extra/xfce4-mount-plugin
+#--- Themes
+x11-themes/elementary-xfce-icon-theme
+x11-themes/greybird
+
+#---------------
+# GUI Utilities
+#---------------
 gui-apps/swaybg
 gui-apps/swaylock-effects
 gui-apps/wlsunset
@@ -18,17 +34,37 @@ gui-apps/slurp
 gui-apps/swappy
 gui-apps/wf-recorder
 
-#---------------#
-# CLI Utilities #
-#---------------#
+#---------------
+# CLI Utilities
+#---------------
 x11-misc/xdg-user-dirs
 x11-misc/dex
 app-eselect/eselect-autostart
 gui-apps/wl-clipboard
+app-admin/stow
+app-shells/fish
+sys-apps/fd
+sys-apps/ripgrep
+
+#----------
+# Programs
+#----------
+www-client/firefox:rapid
+mail-client/thunderbird:0/stable
+net-im/signal-desktop-bin
+media-sound/pavucontrol
+sys-apps/flatpak
+media-video/mpv
+
+#-----
+# VPN
+#-----
+net-vpn/networkmanager-openvpn
+net-vpn/networkmanager-pptp
 
-#-----------#
-# Debugging #
-#-----------#
+#-----------
+# Debugging
+#-----------
 gui-apps/wev
 x11-apps/xeyes
 gui-apps/wlr-randr

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

diff --git a/sets/orf-emacs b/sets/orf-emacs
index 2e929c1fd99351ffe61cc3e961dfb97cfa2122af..39777383fd919dbaf501493efb0d6fcb3b306496 100644 (file)
--- a/sets/orf-emacs
+++ b/sets/orf-emacs
@@ -1,4 +1,3 @@
 app-editors/emacs:31-vcs::orf-overlay
 app-eselect/eselect-emacs
 app-emacs/ebuild-mode
-app-emacs/emacs-eix

diff --git a/sets/orf-extras b/sets/orf-extras
new file mode 100644 (file)
index 0000000..001f764
--- /dev/null
+++ b/sets/orf-extras
@@ -0,0 +1,17 @@
+#----------
+# Programs
+#----------
+media-gfx/gimp
+media-gfx/inkscape
+net-p2p/transmission
+net-irc/hexchat
+app-text/xournalpp
+app-office/libreoffice-bin
+app-emulation/virt-manager
+app-emulation/wine-vanilla
+
+#------
+# Misc
+#------
+net-vpn/tor
+net-misc/yt-dlp

diff --git a/sets/orf-fonts b/sets/orf-fonts
index 35201208b3304804d7bd354d3ebb65944b154207..a87825943b35ae0658d0eed5238667f6f5747830 100644 (file)
--- a/sets/orf-fonts
+++ b/sets/orf-fonts
@@ -1,5 +1,5 @@
 media-fonts/noto-emoji
 media-fonts/noto-cjk
 media-fonts/liberation-fonts
-media-fonts/unifont
 media-fonts/nerdfonts
+media-fonts/unifont

diff --git a/sets/orf-programs b/sets/orf-programs
deleted file mode 100644 (file)
index 11a0fee..0000000
--- a/sets/orf-programs
+++ /dev/null
@@ -1,29 +0,0 @@
-#------------------#
-# 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
deleted file mode 100644 (file)
index 3308a58..0000000
--- a/sets/orf-xfce
+++ /dev/null
@@ -1,24 +0,0 @@
-#------#
-# 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-whiskermenu-plugin
-
-#--------#
-# Themes #
-#--------#
-x11-themes/elementary-xfce-icon-theme
-x11-themes/greybird