Laptop config

10 files changed, 24 insertions, 109 deletions

diff --git a/dracut/dracut.conf.d/dracut.conf b/dracut/dracut.conf.d/dracut.conf
index 0928074..76255a4 100644
--- a/dracut/dracut.conf.d/dracut.conf
+++ b/dracut/dracut.conf.d/dracut.conf
@@ -12,7 +12,7 @@ uefi="yes"
 # 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"
+kernel_cmdline="rd.luks.name=3b7ef73e-87bc-47e2-a719-055508c37269=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/fstab/fstab b/fstab/fstab
index 59de61b..affa6f5 100644
--- a/fstab/fstab
+++ b/fstab/fstab
@@ -23,10 +23,13 @@
 #       documentation for details on setting a label. To obtain the UUID, use
 #       the blkid(8) command.
 
-UUID=A          /boot  vfat noatime                                          0 2
-UUID=B          /      btrfs noatime,compress-force=zstd,autodefrag,subvol=@ 0 1
-UUID=B          /.swap btrfs noatime,subvol=@swap                            0 0
-/.swap/swapfile none   swap sw,loop                                          0 0
+UUID=459cc4ae-8779-4362-92b4-2b5f54c336da /boot       ext2  noatime                                                  0 2
+UUID=D0E2-4312                            /boot/efi   vfat  noatime                                                  0 2
+UUID=7f436ba9-0529-4a6a-8bb2-46f8ef203968 /           btrfs noatime,compress-force=zstd,autodefrag,subvol=@          0 1
+UUID=7f436ba9-0529-4a6a-8bb2-46f8ef203968 /home       btrfs noatime,compress-force=zstd,autodefrag,subvol=@home      0 2
+UUID=7f436ba9-0529-4a6a-8bb2-46f8ef203968 /.snapshots btrfs noatime,compress-force=zstd,autodefrag,subvol=@snapshots 0 2
+UUID=7f436ba9-0529-4a6a-8bb2-46f8ef203968 /.swap      btrfs noatime,subvol=@swap                                     0 0
+/.swap/swapfile                           none        swap  sw,loop                                                  0 0
 
 # /tmp is not mounted as tmpfs automatically by OpenRC
 tmpfs /tmp             tmpfs rw,nosuid,noatime,nodev,mode=1777,rootcontext=system_u:object_r:tmp_t:s0                        0 0
diff --git a/hostname/hostname b/hostname/hostname
index 23574f3..2d6f263 100644
--- a/hostname/hostname
+++ b/hostname/hostname
@@ -1 +1 @@
-gentoo
+laptop
diff --git a/kernel/kernel/config.d/30-cpu-amd.config b/kernel/kernel/config.d/30-cpu-amd.config
deleted file mode 100644
index 22a0adf..0000000
--- a/kernel/kernel/config.d/30-cpu-amd.config
+++ /dev/null
@@ -1,9 +0,0 @@
-# CONFIG_X86_CPU_RESCTRL is not set
-# CONFIG_X86_INTEL_LPSS is not set
-# CONFIG_X86_MCE_INJECT 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/30-gpu-nvidia.config b/kernel/kernel/config.d/30-gpu-nvidia.config
deleted file mode 100644
index ead0c2d..0000000
--- a/kernel/kernel/config.d/30-gpu-nvidia.config
+++ /dev/null
@@ -1,87 +0,0 @@
-CONFIG_BOOT_VESA_SUPPORT=y
-# CONFIG_ACPI_IPMI is not set
-CONFIG_SYSFB=y
-CONFIG_SYSFB_SIMPLEFB=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_IPMI_HANDLER=y
-CONFIG_IPMI_DMI_DECODE=y
-CONFIG_IPMI_PLAT_DATA=y
-# CONFIG_IPMI_PANIC_EVENT is not set
-# CONFIG_IPMI_DEVICE_INTERFACE is not set
-# CONFIG_IPMI_SI is not set
-# CONFIG_IPMI_SSIF is not set
-# CONFIG_IPMI_WATCHDOG is not set
-# CONFIG_IPMI_POWEROFF is not set
-# CONFIG_SENSORS_IBMAEM is not set
-# CONFIG_SENSORS_IBMPEX is not set
-CONFIG_DRM_FBDEV_EMULATION=y
-CONFIG_DRM_FBDEV_OVERALLOC=100
-CONFIG_FB_NOTIFY=y
-CONFIG_FB=y
-# CONFIG_FIRMWARE_EDID is not set
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_SYS_FILLRECT=y
-CONFIG_FB_SYS_COPYAREA=y
-CONFIG_FB_SYS_IMAGEBLIT=y
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-CONFIG_FB_SYS_FOPS=y
-CONFIG_FB_DEFERRED_IO=y
-# CONFIG_FB_MODE_HELPERS is not set
-# CONFIG_FB_TILEBLITTING is not set
-
-#
-# Frame buffer hardware drivers
-#
-# CONFIG_FB_CIRRUS is not set
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_ARC is not set
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_IMSTT is not set
-# CONFIG_FB_VGA16 is not set
-# CONFIG_FB_UVESA is not set
-# CONFIG_FB_VESA is not set
-CONFIG_FB_EFI=y
-# CONFIG_FB_N411 is not set
-# CONFIG_FB_HGA is not set
-# CONFIG_FB_OPENCORES is not set
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_NVIDIA is not set
-# CONFIG_FB_RIVA is not set
-# CONFIG_FB_I740 is not set
-# CONFIG_FB_LE80578 is not set
-# CONFIG_FB_MATROX is not set
-# CONFIG_FB_RADEON is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_ATY is not set
-# CONFIG_FB_S3 is not set
-# CONFIG_FB_SAVAGE is not set
-# CONFIG_FB_SIS is not set
-# CONFIG_FB_NEOMAGIC is not set
-# CONFIG_FB_KYRO is not set
-# CONFIG_FB_3DFX is not set
-# CONFIG_FB_VOODOO1 is not set
-# CONFIG_FB_VT8623 is not set
-# CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_ARK is not set
-# CONFIG_FB_PM3 is not set
-# CONFIG_FB_CARMINE is not set
-# CONFIG_FB_SMSCUFX is not set
-# CONFIG_FB_UDL is not set
-# CONFIG_FB_IBM_GXT4500 is not set
-# CONFIG_FB_VIRTUAL is not set
-# CONFIG_FB_METRONOME is not set
-# CONFIG_FB_MB862XX is not set
-CONFIG_FB_SIMPLE=y
-# CONFIG_FB_SM712 is not set
-CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
-
-# CONFIG_LOGO is not set
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x8=y
diff --git a/kernel/kernel/postinst.d/efi.install b/kernel/kernel/postinst.d/efi.install
index 6fded96..974aa94 100755
--- a/kernel/kernel/postinst.d/efi.install
+++ b/kernel/kernel/postinst.d/efi.install
@@ -9,6 +9,6 @@
 
 ver=${1}
 mkdir -pv "/boot/efi/gentoo"
-cp -v "/boot/config-${ver}" "/boot/efi/gentoo/config"
-cp -v "/boot/vmlinuz-${ver}.efi" "/boot/efi/gentoo/bootx64.efi"
+cp -v "/boot/config-${ver}" "/boot/efi/EFI/gentoo/config"
+cp -v "/boot/vmlinuz-${ver}.efi" "/boot/efi/EFI/gentoo/bootx64.efi"
 #rm -v /boot/*${ver}*
diff --git a/portage/portage/make.conf b/portage/portage/make.conf
index 0b09664..d79eb17 100644
--- a/portage/portage/make.conf
+++ b/portage/portage/make.conf
@@ -1,4 +1,4 @@
-COMMON_FLAGS="-march=native -O3 -pipe"
+COMMON_FLAGS="-march=ivybridge -mtune=ivybridge -maes -O3 -pipe"
 CFLAGS="${COMMON_FLAGS}"
 CXXFLAGS="${COMMON_FLAGS}"
 FCFLAGS="${COMMON_FLAGS}"
@@ -9,10 +9,10 @@ LC_MESSAGES=C
 PORTAGE_NICENESS=19
 PORTAGE_IONICE_COMMAND="ionice -c 3 -p \${PID}"
 
-EMERGE_DEFAULT_OPTS="--ask --ask-enter-invalid --jobs=1 --load-average=1"
-MAKEOPTS="-j1 -l1"
+EMERGE_DEFAULT_OPTS="--ask --ask-enter-invalid --jobs=2 --load-average=3.9"
+MAKEOPTS="-j33 -l4"
 
-FEATURES="nostrip pid-sandbox collision-protect downgrade-backup ipc-sandbox network-sandbox parallel-fetch parallel-install sign"
+FEATURES="distcc nostrip pid-sandbox collision-protect downgrade-backup ipc-sandbox network-sandbox parallel-fetch parallel-install sign"
 
 PORTAGE_LOGDIR=/var/log/portage/
 
@@ -22,6 +22,9 @@ ACCEPT_KEYWORDS="amd64"
 QEMU_SOFTMMU_TARGETS="arm x86_64"
 QEMU_USER_TARGETS="x86_64"
 
+INPUT_DEVICES="libinput synaptics wacom"
+VIDEO_CARDS="intel"
+
 USE="dist-kernel
      pgo \
      -bindist \
diff --git a/portage/portage/package.env b/portage/portage/package.env
index 1612a8a..c17f25e 100644
--- a/portage/portage/package.env
+++ b/portage/portage/package.env
@@ -1 +1 @@
-sys-kernel/gentoo-kernel nodistcc.conf
+sys-kernel/gentoo-kernel nodistcc.conf 4cores.conf
diff --git a/portage/portage/package.use/00cpu-flags b/portage/portage/package.use/00cpu-flags
new file mode 100644
index 0000000..0fa9129
--- /dev/null
+++ b/portage/portage/package.use/00cpu-flags
@@ -0,0 +1 @@
+*/* CPU_FLAGS_X86: aes avx f16c mmx mmxext pclmul popcnt rdrand sse sse2 sse3 sse4_1 sse4_2 ssse3
diff --git a/portage/portage/repos.conf/gentoo-mirror.conf b/portage/portage/repos.conf/gentoo-mirror.conf
new file mode 100644
index 0000000..062e424
--- /dev/null
+++ b/portage/portage/repos.conf/gentoo-mirror.conf
@@ -0,0 +1,4 @@
+[gentoo]
+location = /var/db/repos/gentoo
+sync-type = rsync
+sync-uri = rsync://pc/gentoo-portage