1

18 files changed, 113 insertions, 101 deletions

diff --git a/dracut/dracut.conf.d/dracut.conf b/dracut/dracut.conf.d/dracut.conf
index dc3d51a..0928074 100644
--- a/dracut/dracut.conf.d/dracut.conf
+++ b/dracut/dracut.conf.d/dracut.conf
@@ -5,7 +5,14 @@ hostonly="yes"
 # Choose compression program for the image (gzip is default)
 compress="xz"
 
-# Unified Kernel Image
-uki="yes"
+uefi="yes"
+# this goddamn thing expects a systemd efistub (USE=boot emerge systemd-utils)
+# TODO use efistub of Linux's
 
-kernel_cmdline="rd.luks.uuid=luks-[UUID of crypto_LUKS partition without brackets]"
+# OpenRC does not care for /etc/crypttab, but dracut, being a Redhat's child (a therefore a systemd fanboy) will
+# instead of adding a /etc/crypttab just for dracut, we specify LUKS name
+# why this is not documented anywhere but the depths of forums - I have no goddamn clue; thanks, GlowHat
+kernel_cmdline="rd.luks.name=<crypto_LUKS UUID>=root root=/dev/mapper/root rd.lvm=0 rd.md=0 rd.dm=0"
+
+uefi_secureboot_cert="/etc/secrets/efi/db.crt"
+uefi_secureboot_key="/etc/secrets/efi/db.key"
diff --git a/kernel/kernel/config.d/10-no-ethernet-drivers.config b/kernel/kernel/config.d/10-no-ethernet-drivers.config
index 565a56d..dd8603a 100644
--- a/kernel/kernel/config.d/10-no-ethernet-drivers.config
+++ b/kernel/kernel/config.d/10-no-ethernet-drivers.config
@@ -1,5 +1,70 @@
-# CONFIG_VIRTIO_NET is not set
-# CONFIG_ETHERNET is not set
-# CONFIG_PHYLIB is not set
-# CONFIG_MDIO_DEVICE is not set
-# CONFIG_USB_NET_DRIVERS is not set
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_NET_VENDOR_ADAPTEC is not set
+# CONFIG_NET_VENDOR_AGERE is not set
+# CONFIG_NET_VENDOR_ALACRITECH is not set
+# CONFIG_NET_VENDOR_ALTEON is not set
+# CONFIG_NET_VENDOR_AMAZON is not set
+# CONFIG_NET_VENDOR_AMD is not set
+# CONFIG_NET_VENDOR_AQUANTIA is not set
+# CONFIG_NET_VENDOR_ARC is not set
+# CONFIG_NET_VENDOR_ASIX is not set
+# CONFIG_NET_VENDOR_ATHEROS is not set
+# CONFIG_NET_VENDOR_BROADCOM is not set
+# CONFIG_NET_VENDOR_CADENCE is not set
+# CONFIG_NET_VENDOR_CAVIUM is not set
+# CONFIG_NET_VENDOR_CHELSIO is not set
+# CONFIG_NET_VENDOR_CISCO is not set
+# CONFIG_NET_VENDOR_CORTINA is not set
+# CONFIG_NET_VENDOR_DAVICOM is not set
+# CONFIG_NET_VENDOR_DEC is not set
+# CONFIG_NET_VENDOR_DLINK is not set
+# CONFIG_NET_VENDOR_EMULEX is not set
+# CONFIG_NET_VENDOR_ENGLEDER is not set
+# CONFIG_NET_VENDOR_EZCHIP is not set
+# CONFIG_NET_VENDOR_FUJITSU is not set
+# CONFIG_NET_VENDOR_FUNGIBLE is not set
+# CONFIG_NET_VENDOR_GOOGLE is not set
+# CONFIG_NET_VENDOR_HUAWEI is not set
+# CONFIG_NET_VENDOR_I825XX is not set
+# CONFIG_NET_VENDOR_INTEL is not set
+# CONFIG_NET_VENDOR_WANGXUN is not set
+# CONFIG_NET_VENDOR_LITEX is not set
+# CONFIG_NET_VENDOR_MARVELL is not set
+# CONFIG_NET_VENDOR_MELLANOX is not set
+# CONFIG_NET_VENDOR_MICREL is not set
+# CONFIG_NET_VENDOR_MICROCHIP is not set
+# CONFIG_NET_VENDOR_MICROSEMI is not set
+# CONFIG_NET_VENDOR_MICROSOFT is not set
+# CONFIG_NET_VENDOR_MYRI is not set
+# CONFIG_NET_VENDOR_NI is not set
+# CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_NET_VENDOR_NETERION is not set
+# CONFIG_NET_VENDOR_NETRONOME is not set
+# CONFIG_NET_VENDOR_NVIDIA is not set
+# CONFIG_NET_VENDOR_OKI is not set
+# CONFIG_NET_VENDOR_PACKET_ENGINES is not set
+# CONFIG_NET_VENDOR_PENSANDO is not set
+# CONFIG_NET_VENDOR_QLOGIC is not set
+# CONFIG_NET_VENDOR_BROCADE is not set
+# CONFIG_NET_VENDOR_QUALCOMM is not set
+# CONFIG_NET_VENDOR_RDC is not set
+# CONFIG_NET_VENDOR_REALTEK is not set
+# CONFIG_NET_VENDOR_RENESAS is not set
+# CONFIG_NET_VENDOR_ROCKER is not set
+# CONFIG_NET_VENDOR_SAMSUNG is not set
+# CONFIG_NET_VENDOR_SEEQ is not set
+# CONFIG_NET_VENDOR_SILAN is not set
+# CONFIG_NET_VENDOR_SIS is not set
+# CONFIG_NET_VENDOR_SOLARFLARE is not set
+# CONFIG_NET_VENDOR_SMSC is not set
+# CONFIG_NET_VENDOR_SOCIONEXT is not set
+# CONFIG_NET_VENDOR_STMICRO is not set
+# CONFIG_NET_VENDOR_SUN is not set
+# CONFIG_NET_VENDOR_SYNOPSYS is not set
+# CONFIG_NET_VENDOR_TEHUTI is not set
+# CONFIG_NET_VENDOR_TI is not set
+# CONFIG_NET_VENDOR_VERTEXCOM is not set
+# CONFIG_NET_VENDOR_VIA is not set
+# CONFIG_NET_VENDOR_WIZNET is not set
+# CONFIG_NET_VENDOR_XILINX is not set
+# CONFIG_NET_VENDOR_XIRCOM is not set
diff --git a/kernel/kernel/config.d/10-no-graphics.config b/kernel/kernel/config.d/10-no-graphics.config
new file mode 100644
index 0000000..77b4e2a
--- /dev/null
+++ b/kernel/kernel/config.d/10-no-graphics.config
@@ -0,0 +1,2 @@
+# CONFIG_AGP is not set
+# CONFIG_DRM_I915 is not set
diff --git a/kernel/kernel/config.d/10-no-weird-processor-features.config b/kernel/kernel/config.d/10-no-weird-processor-features.config
index 2b214c6..7c4904c 100644
--- a/kernel/kernel/config.d/10-no-weird-processor-features.config
+++ b/kernel/kernel/config.d/10-no-weird-processor-features.config
@@ -1,18 +1,11 @@
-CONFIG_BROKEN_ON_SMP=y
-CONFIG_PGTABLE_LEVELS=4
-# CONFIG_SMP is not set
 # CONFIG_X86_EXTENDED_PLATFORM is not set
 # CONFIG_HYPERVISOR_GUEST is not set
-CONFIG_NR_CPUS_RANGE_BEGIN=1
-CONFIG_NR_CPUS_RANGE_END=1
-CONFIG_NR_CPUS_DEFAULT=1
-CONFIG_NR_CPUS=1
-CONFIG_UP_LATE_INIT=y
+CONFIG_NR_CPUS=16
 # CONFIG_X86_MCE_INTEL is not set
 # CONFIG_X86_MCE_AMD is not set
 # CONFIG_MICROCODE_INTEL is not set
 # CONFIG_MICROCODE_AMD is not set
 # CONFIG_X86_5LEVEL is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-CONFIG_NEED_PER_CPU_KM=y
+CONFIG_PGTABLE_LEVELS=4
+# all my UEFI are 64bit
+# CONFIG_EFI_MIXED is not set
diff --git a/kernel/kernel/config.d/20-cpu-amd.config b/kernel/kernel/config.d/20-cpu-amd.config
index 39be39d..22a0adf 100644
--- a/kernel/kernel/config.d/20-cpu-amd.config
+++ b/kernel/kernel/config.d/20-cpu-amd.config
@@ -1,8 +1,9 @@
 # CONFIG_X86_CPU_RESCTRL is not set
 # CONFIG_X86_INTEL_LPSS is not set
 # CONFIG_X86_MCE_INJECT is not set
-# CONFIG_MICROCODE_INTEL is not set
 CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT=y
 # CONFIG_X86_SGX is not set
 CONFIG_KVM_AMD=m
 CONFIG_KVM_AMD_SEV=y
+CONFIG_SENSORS_K10TEMP=m
+CONFIG_MICROCODE_AMD=y
diff --git a/kernel/kernel/config.d/20-cpu-intel.config b/kernel/kernel/config.d/20-cpu-intel.config
index 2da0d43..f4e3ff1 100644
--- a/kernel/kernel/config.d/20-cpu-intel.config
+++ b/kernel/kernel/config.d/20-cpu-intel.config
@@ -6,3 +6,4 @@ CONFIG_DRM_DISPLAY_HELPER=y
 CONFIG_DRM_TTM=y
 CONFIG_DRM_BUDDY=y
 CONFIG_DRM_I915=y
+CONFIG_MICROCODE_INTEL=y
diff --git a/kernel/kernel/config.d/20-ethernet-laptop.config b/kernel/kernel/config.d/20-ethernet-laptop.config
new file mode 100644
index 0000000..39b1d95
--- /dev/null
+++ b/kernel/kernel/config.d/20-ethernet-laptop.config
@@ -0,0 +1,4 @@
+CONFIG_NET_VENDOR_INTEL=y
+# CONFIG_E100 is not set
+# CONFIG_E1000 is not set
+CONFIG_E1000E=m
diff --git a/kernel/kernel/config.d/20-ethernet-pc.config b/kernel/kernel/config.d/20-ethernet-pc.config
new file mode 100644
index 0000000..c35a545
--- /dev/null
+++ b/kernel/kernel/config.d/20-ethernet-pc.config
@@ -0,0 +1,3 @@
+CONFIG_NET_VENDOR_REALTEK=y
+# CONFIG_8139TOO is not set
+CONFIG_R8169=m
diff --git a/kernel/kernel/config.d/20-ethernet.config b/kernel/kernel/config.d/20-ethernet.config
deleted file mode 100644
index 5fa6695..0000000
--- a/kernel/kernel/config.d/20-ethernet.config
+++ /dev/null
@@ -1,74 +0,0 @@
-# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_NET_VENDOR_ADAPTEC is not set
-# CONFIG_NET_VENDOR_AGERE is not set
-# CONFIG_NET_VENDOR_ALACRITECH is not set
-# CONFIG_NET_VENDOR_ALTEON is not set
-# CONFIG_NET_VENDOR_AMAZON is not set
-# CONFIG_NET_VENDOR_AMD is not set
-# CONFIG_NET_VENDOR_AQUANTIA is not set
-# CONFIG_NET_VENDOR_ARC is not set
-# CONFIG_NET_VENDOR_ASIX is not set
-# CONFIG_NET_VENDOR_ATHEROS is not set
-# CONFIG_NET_VENDOR_BROADCOM is not set
-# CONFIG_NET_VENDOR_CADENCE is not set
-# CONFIG_NET_VENDOR_CAVIUM is not set
-# CONFIG_NET_VENDOR_CHELSIO is not set
-# CONFIG_NET_VENDOR_CISCO is not set
-# CONFIG_NET_VENDOR_CORTINA is not set
-# CONFIG_NET_VENDOR_DAVICOM is not set
-# CONFIG_NET_VENDOR_DEC is not set
-# CONFIG_NET_VENDOR_DLINK is not set
-# CONFIG_NET_VENDOR_EMULEX is not set
-# CONFIG_NET_VENDOR_ENGLEDER is not set
-# CONFIG_NET_VENDOR_EZCHIP is not set
-# CONFIG_NET_VENDOR_FUJITSU is not set
-# CONFIG_NET_VENDOR_FUNGIBLE is not set
-# CONFIG_NET_VENDOR_GOOGLE is not set
-# CONFIG_NET_VENDOR_HUAWEI is not set
-# CONFIG_NET_VENDOR_I825XX is not set
-# CONFIG_E100 is not set
-# CONFIG_E1000 is not set
-CONFIG_E1000E=m
-# CONFIG_NET_VENDOR_WANGXUN is not set
-# CONFIG_NET_VENDOR_LITEX is not set
-# CONFIG_NET_VENDOR_MARVELL is not set
-# CONFIG_NET_VENDOR_MELLANOX is not set
-# CONFIG_NET_VENDOR_MICREL is not set
-# CONFIG_NET_VENDOR_MICROCHIP is not set
-# CONFIG_NET_VENDOR_MICROSEMI is not set
-# CONFIG_NET_VENDOR_MICROSOFT is not set
-# CONFIG_NET_VENDOR_MYRI is not set
-# CONFIG_NET_VENDOR_NI is not set
-# CONFIG_NET_VENDOR_NATSEMI is not set
-# CONFIG_NET_VENDOR_NETERION is not set
-# CONFIG_NET_VENDOR_NETRONOME is not set
-# CONFIG_NET_VENDOR_NVIDIA is not set
-# CONFIG_NET_VENDOR_OKI is not set
-# CONFIG_NET_VENDOR_PACKET_ENGINES is not set
-# CONFIG_NET_VENDOR_PENSANDO is not set
-# CONFIG_NET_VENDOR_QLOGIC is not set
-# CONFIG_NET_VENDOR_BROCADE is not set
-# CONFIG_NET_VENDOR_QUALCOMM is not set
-# CONFIG_NET_VENDOR_RDC is not set
-# CONFIG_8139TOO is not set
-CONFIG_R8169=m
-# CONFIG_NET_VENDOR_RENESAS is not set
-# CONFIG_NET_VENDOR_ROCKER is not set
-# CONFIG_NET_VENDOR_SAMSUNG is not set
-# CONFIG_NET_VENDOR_SEEQ is not set
-# CONFIG_NET_VENDOR_SILAN is not set
-# CONFIG_NET_VENDOR_SIS is not set
-# CONFIG_NET_VENDOR_SOLARFLARE is not set
-# CONFIG_NET_VENDOR_SMSC is not set
-# CONFIG_NET_VENDOR_SOCIONEXT is not set
-# CONFIG_NET_VENDOR_STMICRO is not set
-# CONFIG_NET_VENDOR_SUN is not set
-# CONFIG_NET_VENDOR_SYNOPSYS is not set
-# CONFIG_NET_VENDOR_TEHUTI is not set
-# CONFIG_NET_VENDOR_TI is not set
-# CONFIG_NET_VENDOR_VERTEXCOM is not set
-# CONFIG_NET_VENDOR_VIA is not set
-# CONFIG_NET_VENDOR_WIZNET is not set
-# CONFIG_NET_VENDOR_XILINX is not set
-# CONFIG_NET_VENDOR_XIRCOM is not set
-# CONFIG_USB_NET_DRIVERS is not set 
diff --git a/kernel/kernel/config.d/20-filesystems.config b/kernel/kernel/config.d/20-filesystems.config
index 341e3b4..6d421de 100644
--- a/kernel/kernel/config.d/20-filesystems.config
+++ b/kernel/kernel/config.d/20-filesystems.config
@@ -39,3 +39,4 @@ CONFIG_RAID6_PQ=y
 CONFIG_RAID6_PQ_BENCHMARK=y
 CONFIG_LIBCRC32C=y
 CONFIG_ZSTD_COMPRESS=y
+CONFIG_UDF_FS=m
diff --git a/kernel/kernel/config.d/20-sensors-pc.config b/kernel/kernel/config.d/20-sensors-pc.config
new file mode 100644
index 0000000..8bde142
--- /dev/null
+++ b/kernel/kernel/config.d/20-sensors-pc.config
@@ -0,0 +1 @@
+CONFIG_SENSORS_NCT6775=m
diff --git a/kernel/kernel/config.d/30-openvpn.config b/kernel/kernel/config.d/30-openvpn.config
new file mode 100644
index 0000000..12009e3
--- /dev/null
+++ b/kernel/kernel/config.d/30-openvpn.config
@@ -0,0 +1 @@
+CONFIG_TUN=m
diff --git a/kernel/kernel/config.d/30-ufw.config b/kernel/kernel/config.d/30-ufw.config
new file mode 100644
index 0000000..4655e4b
--- /dev/null
+++ b/kernel/kernel/config.d/30-ufw.config
@@ -0,0 +1,4 @@
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_HL=m
diff --git a/kernel/kernel/postinst.d/efi.install b/kernel/kernel/postinst.d/efi.install
index 85514de..8855c6f 100755
--- a/kernel/kernel/postinst.d/efi.install
+++ b/kernel/kernel/postinst.d/efi.install
@@ -5,11 +5,10 @@
 # from https://forums.gentoo.org/viewtopic-t-1128103-start-0.html
 # installkernel script itself runs any executable scripts in /etc/kernel/postinst.d/* with $1 being kernel version, and $2 path to the kernel.
 
-# taken from
-# https://forums.gentoo.org/viewtopic-p-8810619.html
+# adapted from https://forums.gentoo.org/viewtopic-p-8810619.html
 
 ver=${1}
 mkdir -pv "/boot/efi/gentoo"
-mv -v "/boot/config-${ver}" "/boot/efi/gentoo/config"
-mv -v "/boot/vmlinuz-${ver}" "/boot/efi/gentoo/bootx64.efi"
-rm -v /boot/*${ver}*
+cp -v "/boot/config-${ver}" "/boot/efi/gentoo/config"
+cp -v "/boot/vmlinuz-${ver}" "/boot/efi/gentoo/bootx64.efi"
+#rm -v /boot/*${ver}*
diff --git a/portage/portage/make.conf b/portage/portage/make.conf
index 8a3c1b6..ac00d3c 100644
--- a/portage/portage/make.conf
+++ b/portage/portage/make.conf
@@ -14,6 +14,8 @@ MAKEOPTS="-j1 -l1"
 
 FEATURES="nostrip pid-sandbox collision-protect downgrade-backup ipc-sandbox network-sandbox parallel-fetch parallel-install sign"
 
+PORTAGE_LOGDIR=/var/log/portage/
+
 ACCEPT_LICENSE="-* @BINARY-REDISTRIBUTABLE"
 ACCEPT_KEYWORDS="amd64"
 
diff --git a/portage/portage/package.accept_keywords b/portage/portage/package.accept_keywords
index b638dc8..d71ff8a 100644
--- a/portage/portage/package.accept_keywords
+++ b/portage/portage/package.accept_keywords
@@ -39,7 +39,7 @@ dev-libs/supercop ~amd64
 
 app-misc/dragon ~amd64
 
->=media-sound/ncpamixer-9999 ~amd64 **
+media-sound/ncpamixer ~amd64
 
 games-emulation/citra ~amd64 **
 
diff --git a/portage/portage/package.use/common b/portage/portage/package.use/common
index 6fbb0d9..22b8fb6 100644
--- a/portage/portage/package.use/common
+++ b/portage/portage/package.use/common
@@ -38,3 +38,6 @@ app-misc/nnn gitstatus
 app-text/texlive -cjk l10n_fr
 
 sys-kernel/gentoo-kernel hardened
+
+# for an efistub used by dracut
+sys-apps/systemd-utils boot kernel-install
diff --git a/portage/portage/sets/icommon b/portage/portage/sets/icommon
index 378eee2..5e4d281 100644
--- a/portage/portage/sets/icommon
+++ b/portage/portage/sets/icommon
@@ -90,7 +90,6 @@ virtual/jre
 virtual/wine
 www-client/firefox-bin
 x11-base/xorg-server
-x11-misc/devour
 x11-misc/dmenu
 x11-misc/dunst
 x11-misc/grabc