From a1442ffaa3890977d27570e81c6afde08073a71e Mon Sep 17 00:00:00 2001
From: luc <luc@bijl.us>
Date: Sat, 8 Aug 2026 13:29:40 +0200
Subject: [PATCH 1/3] etc/portage: rename and remove

---
 etc/portage/package.accept_keywords/05boot       | 5 -----
 etc/portage/package.license/{kernel => firmware} | 2 +-
 etc/portage/package.mask/river                   | 4 ----
 3 files changed, 1 insertion(+), 10 deletions(-)
 delete mode 100644 etc/portage/package.accept_keywords/05boot
 rename etc/portage/package.license/{kernel => firmware} (72%)
 delete mode 100644 etc/portage/package.mask/river

diff --git a/etc/portage/package.accept_keywords/05boot b/etc/portage/package.accept_keywords/05boot
deleted file mode 100644
index aeab99f..0000000
--- a/etc/portage/package.accept_keywords/05boot
+++ /dev/null
@@ -1,5 +0,0 @@
-# /etc/portage/package.accept_keywords/05boot
-# Keywords for boot system
-
-# zlevis
-dev-libs/jose ~amd64
diff --git a/etc/portage/package.license/kernel b/etc/portage/package.license/firmware
similarity index 72%
rename from etc/portage/package.license/kernel
rename to etc/portage/package.license/firmware
index b481ef9..ca3fb7c 100644
--- a/etc/portage/package.license/kernel
+++ b/etc/portage/package.license/firmware
@@ -1,4 +1,4 @@
-# /etc/portage/package.license/kernel
+# /etc/portage/package.license/firmware
 # Accept firmware licenses
 
 sys-kernel/linux-firmware linux-fw-redistributable @BINARY-REDISTRIBUTABLE
diff --git a/etc/portage/package.mask/river b/etc/portage/package.mask/river
deleted file mode 100644
index 6e28449..0000000
--- a/etc/portage/package.mask/river
+++ /dev/null
@@ -1,4 +0,0 @@
-# /etc/portage/package.mask/river
-# Mask river 0.4 to remain in river classic
-
->=gui-wm/river-0.4

From 5d81be332fdc9410493b213d29588d9f5e4f3f87 Mon Sep 17 00:00:00 2001
From: luc <luc@bijl.us>
Date: Sat, 8 Aug 2026 13:30:21 +0200
Subject: [PATCH 2/3] etc/portage/package.use/05boot: update

---
 etc/portage/package.use/05boot | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/etc/portage/package.use/05boot b/etc/portage/package.use/05boot
index 635ee51..5ac3c51 100644
--- a/etc/portage/package.use/05boot
+++ b/etc/portage/package.use/05boot
@@ -3,7 +3,9 @@
 
 # installkernel
 sys-kernel/installkernel dracut ukify uki
+
+# systemd-boot
 sys-apps/systemd-utils kernel-install boot ukify
 
-# zlevis
+# tpm
 app-crypt/zlevis dracut

From 563955381ba8c204a644c98b9979ca854d815047 Mon Sep 17 00:00:00 2001
From: luc <luc@bijl.us>
Date: Sat, 8 Aug 2026 13:30:41 +0200
Subject: [PATCH 3/3] etc/portage/sets: update

Move some boot thingies in base to new boot set
---
 etc/portage/sets/base | 22 ++++++++--------------
 etc/portage/sets/boot | 12 ++++++++++++
 2 files changed, 20 insertions(+), 14 deletions(-)
 create mode 100644 etc/portage/sets/boot

diff --git a/etc/portage/sets/base b/etc/portage/sets/base
index c94e38b..911335d 100644
--- a/etc/portage/sets/base
+++ b/etc/portage/sets/base
@@ -3,34 +3,27 @@
 
 # kernel
 sys-kernel/linux-firmware
-#sys-firmware/intel-microcode
 sys-kernel/gentoo-sources
 sys-kernel/modprobed-db
-sys-apps/openrc
+sys-power/acpid
+
+# filesystem
 sys-fs/zfs
 sys-fs/zfs-kmod
-sys-power/acpid
-#app-laptop/laptop-mode-tools
-
-# boot
-app-crypt/sbsigntools
-app-crypt/sbctl
-app-crypt/zlevis
-app-crypt/jitterentropy
-sys-apps/systemd-utils
 
 # portage
 sys-apps/portage
-app-eselect/eselect-repository
 app-portage/cpuid2cpuflags
 app-portage/gentoolkit
+app-eselect/eselect-repository
 app-admin/eclean-kernel
 
 # musl
 sys-libs/timezone-data
 sys-libs/error-standalone
 
-# services
+# init/services
+sys-apps/openrc
 net-misc/openntpd
 sys-block/zram-init
 net-misc/networkmanager
@@ -38,7 +31,8 @@ net-wireless/bluez
 net-vpn/tailscale
 net-print/cups-meta
 
-# apparmor
+# security
+app-crypt/jitterentropy
 sys-apps/apparmor
 sys-apps/apparmor-utils
 sec-policy/apparmor-profiles
diff --git a/etc/portage/sets/boot b/etc/portage/sets/boot
new file mode 100644
index 0000000..2eec959
--- /dev/null
+++ b/etc/portage/sets/boot
@@ -0,0 +1,12 @@
+# /etc/portage/sets/boot
+# Set containing packages for boot system
+
+# systemd-boot
+sys-apps/systemd-utils
+
+# secureboot
+app-crypt/sbctl
+app-crypt/sbsigntools
+
+# tpm
+app-crypt/zlevis