21 files changed, 63 insertions, 84 deletions
diff --git a/hosts/moyo/fstab b/hosts/moyo/fstab
index 29b6c66..67c5688 100644
--- a/hosts/moyo/fstab
+++ b/hosts/moyo/fstab
@@ -1,7 +1,23 @@
-/dev/moyo-vg0/root     /            ext4    noatime              0 1
-UUID="879D-5154"       /boot        vfat    defaults,noatime     0 2
-/dev/moyo-vg0/swap     none         swap    sw                   0 0
+# /etc/fstab: static file system information.
+#
+# See the manpage fstab(5) for more information.
+#
+# NOTE: The root filesystem should have a pass number of either 0 or 1.
+#       All other filesystems should have a pass number of 0 or greater than 1.
+#
+# NOTE: Even though we list ext4 as the type here, it will work with ext2/ext3
+#       filesystems.  This just tells the kernel to use the ext4 driver.
+#
+# NOTE: You can use full paths to devices like /dev/sda3, but it is often
+#       more reliable to use filesystem labels or UUIDs. See your filesystem
+#       documentation for details on setting a label. To obtain the UUID, use
+#       the blkid(8) command.
 
-tmpfs     /var/tmp/portage  tmpfs     size=6G,uid=portage,gid=portage,mode=775  0 0
+# <fs>			<mountpoint>	<type>		<opts>		<dump> <pass>
 
-#hugetlbfs /hugepages        hugetlbfs mode=1770,gid=100                         0 0
+UUID="1D54-467B"    /efi        vfat  umask=0077,tz=UTC  0 2
+/dev/moyo-vg0/swap  none        swap  sw                 0 0
+/dev/moyo-vg0/root  /           ext4  defaults,noatime   0 1
+/dev/mapper/store   /mnt/store  ext4  defaults,noatime   0 2
+
+tmpfs /var/tmp/portage tmpfs size=4G,uid=portage,gid=portage,mode=775 0 0
diff --git a/hosts/moyo/gentoo/package.use/ffmpeg b/hosts/moyo/gentoo/package.use/ffmpeg
index 3434c7a..689f92f 100644
--- a/hosts/moyo/gentoo/package.use/ffmpeg
+++ b/hosts/moyo/gentoo/package.use/ffmpeg
@@ -1 +1 @@
-media-video/ffmpeg -libass
+media-video/ffmpeg webp -libass
diff --git a/hosts/moyo/grub_config b/hosts/moyo/grub_config
index b095501..c5bd2fb 100644
--- a/hosts/moyo/grub_config
+++ b/hosts/moyo/grub_config
@@ -14,7 +14,7 @@ GRUB_DISTRIBUTOR="Gentoo"
 #GRUB_DEFAULT=0
 
 # Boot the default entry this many seconds after the menu is displayed
-#GRUB_TIMEOUT=5
+GRUB_TIMEOUT=3
 #GRUB_TIMEOUT_STYLE=menu
 
 # Append parameters to the linux kernel command line
@@ -29,15 +29,14 @@ GRUB_CMDLINE_LINUX="quiet text rd.lvm.vg=moyo-vg0"
 # GRUB_CMDLINE_LINUX="init=/usr/lib/systemd/systemd"
 
 # Append parameters to the linux kernel command line for non-recovery entries
-# default_hugepagesz=2M hugepagesz=2M hugepages=4096
-GRUB_CMDLINE_LINUX_DEFAULT="mitigations=off amd_iommu=on iommu=pt"
+GRUB_CMDLINE_LINUX_DEFAULT="amd_iommu=on iommu=pt amdgpu.ppfeaturemask=0xffffffff mitigations=off"
 
 # Uncomment to disable graphical terminal (grub-pc only)
 #GRUB_TERMINAL=console
 
-# The resolution used on graphical terminal.
-# Note that you can use only modes which your graphic card supports via VBE.
-# You can see them in real GRUB with the command `vbeinfo'.
+# Resolution used on graphical terminal.
+# The list of valid modes may be obtained using the 'vbeinfo' (PC BIOS) or
+# 'videoinfo' (EFI) command from a GRUB boot prompt.
 #GRUB_GFXMODE=640x480
 
 # Set to 'text' to force the Linux kernel to boot in normal text
diff --git a/hosts/moyo/libvirt/qemu/denpa.xml b/hosts/moyo/libvirt/qemu/station.xml
index 14e4972..3b8219c 100644
--- a/hosts/moyo/libvirt/qemu/denpa.xml
+++ b/hosts/moyo/libvirt/qemu/station.xml
@@ -1,13 +1,13 @@
 <!--
 WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
 OVERWRITTEN AND LOST. Changes to this xml configuration should be made using:
-  virsh edit denpa
+  virsh edit station
 or other application using the libvirt API.
 -->
 
 <domain type='kvm'>
-  <name>denpa</name>
-  <uuid>3c983499-1569-48f4-994f-d665f40097ac</uuid>
+  <name>station</name>
+  <uuid></uuid>
   <metadata>
     <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
       <libosinfo:os id="http://rockylinux.org/rocky/9"/>
@@ -21,13 +21,13 @@ or other application using the libvirt API.
   </memoryBacking>
   <vcpu placement='static'>2</vcpu>
   <os firmware='efi'>
-    <type arch='x86_64' machine='pc-q35-9.1'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-10.0'>hvm</type>
     <firmware>
       <feature enabled='no' name='enrolled-keys'/>
       <feature enabled='no' name='secure-boot'/>
     </firmware>
-    <loader readonly='yes' type='pflash'>/usr/share/edk2-ovmf/OVMF_CODE.fd</loader>
-    <nvram template='/usr/share/edk2-ovmf/OVMF_VARS.fd'>/var/lib/libvirt/qemu/nvram/denpa_VARS.fd</nvram>
+    <loader readonly='yes' type='pflash' format='raw'>/usr/share/edk2/OvmfX64/OVMF_CODE.fd</loader>
+    <nvram template='/usr/share/edk2/OvmfX64/OVMF_VARS.fd' templateFormat='raw' format='raw'>/var/lib/libvirt/qemu/nvram/station_VARS.fd</nvram>
   </os>
   <features>
     <acpi/>
@@ -56,15 +56,19 @@ or other application using the libvirt API.
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type='file' device='disk'>
-      <driver name='qemu' type='qcow2' cache='writeback' io='io_uring' discard='unmap'/>
-      <source file='/var/lib/libvirt/images/denpa.qcow2'/>
+      <driver name='qemu' type='qcow2' io='io_uring'/>
+      <source file='/mnt/store/station/station.qcow2'/>
       <target dev='vda' bus='virtio'/>
       <boot order='1'/>
       <address type='pci' domain='0x0000' bus='0x08' slot='0x00' function='0x0'/>
     </disk>
-    <controller type='usb' index='0' model='qemu-xhci' ports='15'>
-      <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
-    </controller>
+    <disk type='file' device='cdrom'>
+      <driver name='qemu' type='raw'/>
+      <source file='/home/andrew/isos/debian-trixie-DI-rc2-amd64-netinst.iso'/>
+      <target dev='hdc' bus='sata'/>
+      <readonly/>
+      <address type='drive' controller='0' bus='0' target='0' unit='2'/>
+    </disk>
     <controller type='pci' index='0' model='pcie-root'/>
     <controller type='pci' index='1' model='pcie-root-port'>
       <model name='pcie-root-port'/>
@@ -145,21 +149,11 @@ or other application using the libvirt API.
     <controller type='scsi' index='0' model='virtio-scsi'>
       <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
     </controller>
-    <filesystem type='mount' accessmode='passthrough'>
-      <driver type='virtiofs'/>
-      <binary path='/usr/libexec/virtiofsd'/>
-      <source dir='/mnt/store0/mail'/>
-      <target dir='mail'/>
-      <address type='pci' domain='0x0000' bus='0x07' slot='0x00' function='0x0'/>
-    </filesystem>
-    <filesystem type='mount' accessmode='passthrough'>
-      <driver type='virtiofs'/>
-      <source dir='/mnt/store0/git'/>
-      <target dir='git'/>
-      <address type='pci' domain='0x0000' bus='0x09' slot='0x00' function='0x0'/>
-    </filesystem>
+    <controller type='usb' index='0' model='qemu-xhci'>
+      <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
+    </controller>
     <interface type='bridge'>
-      <mac address='52:54:00:b3:83:8a'/>
+      <mac address=''/>
       <source bridge='virbr0'/>
       <model type='virtio'/>
       <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
@@ -172,17 +166,17 @@ or other application using the libvirt API.
     <console type='pty'>
       <target type='serial' port='0'/>
     </console>
-    <channel type='unix'>
-      <target type='virtio' name='org.qemu.guest_agent.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='1'/>
-    </channel>
+    <console type='pty'>
+      <target type='virtio' port='1'/>
+    </console>
+    <console type='pty'>
+      <target type='virtio' port='2'/>
+    </console>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <watchdog model='itco' action='reset'/>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
-    </memballoon>
+    <memballoon model='none'/>
     <rng model='virtio'>
       <backend model='random'>/dev/urandom</backend>
       <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
diff --git a/hosts/moyo/scripts/do-grub-install b/hosts/moyo/scripts/do-grub-install
deleted file mode 100755
index 8dda1cb..0000000
--- a/hosts/moyo/scripts/do-grub-install
+++ /dev/null
@@ -1,2 +0,0 @@
-#! /usr/bin/env sh
-sudo grub-install --target=x86_64-efi --efi-directory=/boot
diff --git a/hosts/moyo/scripts/emerge-update b/hosts/moyo/scripts/emerge-update
deleted file mode 100755
index 2f8d3fe..0000000
--- a/hosts/moyo/scripts/emerge-update
+++ /dev/null
@@ -1,2 +0,0 @@
-#! /usr/bin/env sh
-sudo emerge --ask --verbose --update --deep --newuse @world
diff --git a/hosts/moyo/scripts/export-nfs b/hosts/moyo/scripts/export-nfs
index 3643fa3..c09433a 100755
--- a/hosts/moyo/scripts/export-nfs
+++ b/hosts/moyo/scripts/export-nfs
@@ -1,2 +1,2 @@
 #! /usr/bin/env sh
-sudo exportfs -o rw,async,insecure,no_subtree_check,crossmnt -i 192.168.0.0/16:$1
+exportfs -o rw,async,insecure,no_subtree_check,crossmnt -i 192.168.0.0/16:$1
diff --git a/hosts/moyo/scripts/gen-dracut b/hosts/moyo/scripts/gen-dracut
deleted file mode 100755
index 92eb88a..0000000
--- a/hosts/moyo/scripts/gen-dracut
+++ /dev/null
@@ -1,2 +0,0 @@
-#! /usr/bin/env sh
-dracut -a lvm --kver=6.12.31-gentoo --force
diff --git a/hosts/moyo/scripts/id-dm-device b/hosts/moyo/scripts/id-dm-device
deleted file mode 100755
index b7d5781..0000000
--- a/hosts/moyo/scripts/id-dm-device
+++ /dev/null
@@ -1,2 +0,0 @@
-#! /usr/bin/env sh
-sudo sudo dmsetup info /dev/$1
diff --git a/hosts/moyo/scripts/mount-luks b/hosts/moyo/scripts/mount-luks
deleted file mode 100755
index 5be1aaa..0000000
--- a/hosts/moyo/scripts/mount-luks
+++ /dev/null
@@ -1,11 +0,0 @@
-#! /usr/bin/env sh
-
-sudo cryptsetup luksOpen /dev/mapper/moyo--vg1-moyo--store0--raid1 moyo-store0
-sudo mount /dev/mapper/moyo-store0 /mnt/store0
-
-sudo mount --bind /mnt/store0/nfs/c /srv/nfs/c
-sudo mount --bind /mnt/store0/nfs/pics /srv/nfs/pics
-sudo mount --bind /mnt/store0/nfs/samba /srv/nfs/samba
-$HOME/scripts/export-nfs /srv/nfs/c
-$HOME/scripts/export-nfs /srv/nfs/pics
-$HOME/scripts/export-nfs /srv/nfs/samba
diff --git a/hosts/moyo/scripts/prepare-network-mounts b/hosts/moyo/scripts/prepare-network-mounts
new file mode 100755
index 0000000..68afa14
--- /dev/null
+++ b/hosts/moyo/scripts/prepare-network-mounts
@@ -0,0 +1,5 @@
+#! /usr/bin/env sh
+su -c 'mount --bind /mnt/store/nfs /srv/nfs && \
+  /home/andrew/scripts/export-nfs /srv/nfs/c && \
+  /home/andrew/scripts/export-nfs /srv/nfs/pics && \
+  /home/andrew/scripts/export-nfs /srv/nfs/samba'
diff --git a/hosts/moyo/scripts/raid-status b/hosts/moyo/scripts/raid-status
deleted file mode 100755
index 8e1e86a..0000000
--- a/hosts/moyo/scripts/raid-status
+++ /dev/null
@@ -1,2 +0,0 @@
-#! /usr/bin/env sh
-sudo lvs -a -o name,copy_percent,health_status,devices moyo-vg1
diff --git a/hosts/moyo/sshd_config b/hosts/moyo/sshd_config
deleted file mode 100644
index 91fe201..0000000
--- a/hosts/moyo/sshd_config
+++ /dev/null
@@ -1,7 +0,0 @@
-PermitRootLogin no
-PubkeyAuthentication yes
-PasswordAuthentication no
-PermitEmptyPasswords no
-KbdInteractiveAuthentication no
-Subsystem	sftp	/usr/lib64/misc/sftp-server
-Include "/etc/ssh/sshd_config.d/*.conf"
diff --git a/hosts/moyo/sshd_config.d/9999999moyo.conf b/hosts/moyo/sshd_config.d/9999999moyo.conf
new file mode 100644
index 0000000..7c25be7
--- /dev/null
+++ b/hosts/moyo/sshd_config.d/9999999moyo.conf
@@ -0,0 +1,4 @@
+PermitRootLogin no
+PermitEmptyPasswords no
+KbdInteractiveAuthentication no
+PubkeyAuthentication yes
diff --git a/hosts/moyo/sysctl.d/cachyos.conf b/hosts/moyo/sysctl.d/cachyos.conf
deleted file mode 100644
index 595258f..0000000
--- a/hosts/moyo/sysctl.d/cachyos.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# Full list in iroha/sysctl.d
-vm.swappiness = 100
-net.core.netdev_max_backlog = 4096
diff --git a/hosts/moyo/sysctl.d/coredump.conf b/hosts/moyo/sysctl.d/coredump.conf
deleted file mode 100644
index 1de438b..0000000
--- a/hosts/moyo/sysctl.d/coredump.conf
+++ /dev/null
@@ -1 +0,0 @@
-kernel.core_pattern=/dev/null
diff --git a/hosts/moyo/sysctl.d/forwarding.conf b/hosts/moyo/sysctl.d/forwarding.conf
deleted file mode 100644
index 4234b54..0000000
--- a/hosts/moyo/sysctl.d/forwarding.conf
+++ /dev/null
@@ -1 +0,0 @@
-net.ipv4.ip_forward = 1
diff --git a/hosts/moyo/sysctl.d/iotop.conf b/hosts/moyo/sysctl.d/iotop.conf
deleted file mode 100644
index 2655235..0000000
--- a/hosts/moyo/sysctl.d/iotop.conf
+++ /dev/null
@@ -1 +0,0 @@
-kernel.task_delayacct = 1
diff --git a/hosts/moyo/sysctl.d/libvirt.conf b/hosts/moyo/sysctl.d/libvirt.conf
deleted file mode 100644
index 3d6a55d..0000000
--- a/hosts/moyo/sysctl.d/libvirt.conf
+++ /dev/null
@@ -1 +0,0 @@
-vm.min_free_kbytes = 112640
diff --git a/hosts/moyo/sysctl.d/perfmon.conf b/hosts/moyo/sysctl.d/perfmon.conf
deleted file mode 100644
index 6c74468..0000000
--- a/hosts/moyo/sysctl.d/perfmon.conf
+++ /dev/null
@@ -1 +0,0 @@
-kernel.perf_event_paranoid = 0
diff --git a/hosts/moyo/sysctl.d/tcp.conf b/hosts/moyo/sysctl.d/tcp.conf
deleted file mode 100644
index 193417e..0000000
--- a/hosts/moyo/sysctl.d/tcp.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-net.ipv4.tcp_keepalive_time = 160
-net.ipv4.tcp_keepalive_intvl = 20
-net.ipv4.tcp_keepalive_probes = 6