notes: fix raspi install notes, also @home -> @username

diff --git a/archpkg/repo-sign b/archpkg/repo-sign
index e555c43ad4ca1a259e1027402116a7a4af226264..f72d8ea9cc2087917718d9110ce0c0bfb1901605 100755 (executable)
--- a/archpkg/repo-sign
+++ b/archpkg/repo-sign
@@ -25,7 +25,7 @@ if [ "${#tosign[@]}" -gt 0 ]; then
     echo
     set -x
     # Preload the agent
-    gpg --output /dev/null --detach-sign /dev/null
+    gpg --output - --detach-sign <(echo) > /dev/null
     echo "${tosign[@]}" | xargs -n1 gpg --detach-sign
     echo "${tosign[@]}" | xargs -n1 repo-add delx.db.tar.xz -R
 else

diff --git a/notes/desktop:debian-bookworm.txt b/notes/desktop:debian-bookworm.txt
index 745a71c2022820b9fb10d813c8dd2232e95bb207..ce4150e16db6de4e47c45479d7b58b236aba4f19 100644 (file)
--- a/notes/desktop:debian-bookworm.txt
+++ b/notes/desktop:debian-bookworm.txt
@@ -18,10 +18,10 @@ cd /mnt/
 btrfs fi label /mnt/ btrfsroot
 btrfs subv create @root
 btrfs subv set-default /mnt/@root
-btrfs subv create @home
+btrfs subv create @$THE_USERNAME
 btrfs subv create @apt
-btrfs subv create @vartmp
-chmod 1777 @vartmp
+btrfs subv create @varlog
+btrfs subv create @vartmp; chmod 1777 @vartmp ; chmod 0755 @root/var/tmp
 umount /mnt/
 mount /dev/mapper/$THE_HOSTNAME-root /mnt/
 
@@ -29,8 +29,9 @@ mkdir -p /mnt/etc/
 cat <<EOT > /mnt/etc/fstab
 LABEL=btrfsroot             /                   btrfs   subvol=@root,discard,compress,nodev             0 0
 LABEL=btrfsroot             /btrfs              btrfs   subvol=/,discard,compress,nodev,nosuid          0 0
-LABEL=btrfsroot             /home               btrfs   subvol=@home,discard,compress,nodev,nosuid      0 0
+LABEL=btrfsroot             /home/$THE_USERNAME btrfs   subvol=@$THE_USERNAME,discard,compress,nodev,nosuid      0 0
 LABEL=btrfsroot             /var/cache/apt      btrfs   subvol=@apt,discard,compress,nodev,nosuid       0 0
+LABEL=btrfsroot             /var/log            btrfs   subvol=@varlog,discard,compress,nodev,nosuid    0 0
 LABEL=btrfsroot             /var/tmp            btrfs   subvol=@vartmp,discard,compress,nodev,nosuid    0 0
 PARTLABEL=XBOOTLDR          /boot               ext4    discard,nodev,nosuid,noexec                     0 0
 PARTLABEL=ESP               /boot/efi           vfat    discard,nodev,nosuid,noexec                     0 0
@@ -50,7 +51,7 @@ EOT
 
 for i in /dev /proc /sys /run /tmp; do mount --rbind $i /mnt$i; done
 chroot /mnt/
-mkdir -p /btrfs/ /boot/efi/ /home/ /var/cache/apt/ /var/tmp/
+mkdir -p /btrfs/ /boot/efi/ /home/$THE_USERNAME /var/cache/apt/ /var/tmp/
 
 
 mkdir /run/systemd/resolve/

diff --git a/notes/raspi-headless:debian-bookworm.txt b/notes/raspi-headless:debian-bookworm.txt
index b29a0e51dacd6db7f6a0aac8919d3e95047ea5ba..db1f0a68533431d959c63cc8359992670b04197b 100644 (file)
--- a/notes/raspi-headless:debian-bookworm.txt
+++ b/notes/raspi-headless:debian-bookworm.txt
@@ -6,7 +6,7 @@ raspi.debian.net
 xzcat image.xz | pv > $THE_DEV
 
 
-gdisk $THE_DEV
+fdisk $THE_DEV
 # resize partition 2
 
 
@@ -21,6 +21,7 @@ mv ./* @root/
 mv @root/ext2_saved/ @ext2_saved
 mkdir @root/btrfs
 btrfs subv create @apt; mv @root/var/cache/apt/archives/* @apt/
+btrfs subv create @varlog
 btrfs subv create @vartmp; chmod 1777 @vartmp ; chmod 0755 @root/var/tmp
 btrfs subv set-default @root
 
@@ -29,6 +30,7 @@ cat <<EOT >| @root/etc/fstab
 LABEL=RASPIROOT         /                       btrfs   subvol=@root,discard,compress,nodev                 2   0
 LABEL=RASPIROOT         /btrfs                  btrfs   subvol=/,discard,compress,nodev,nosuid              0   0
 LABEL=RASPIROOT         /var/cache/apt/archives btrfs   subvol=@apt,discard,compress,nodev,nosuid           0   0
+LABEL=RASPIROOT         /var/log                btrfs   subvol=@varlog,discard,compress,nodev,nosuid        0   0
 LABEL=RASPIROOT         /var/tmp                btrfs   subvol=@vartmp,discard,compress,nodev,nosuid        0   0
 LABEL=RASPIFIRM         /boot/firmware          vfat    discard,nodev,nosuid,noexec                         1   0
 EOT
@@ -38,14 +40,14 @@ rm @root/initrd.img @root/initrd.img.old @root/vmlinuz @root/vmlinuz.old
 echo 'do_symlinks=no' > @root/etc/kernel-img.conf
 
 rmdir @root/var/log/journal
-find @root/usr/local -type f -print #-delete
-find @root/etc/systemd/system -name 'rpi*' -print #-delete
+find @root/usr/local -type f -print -delete
+find @root/etc/systemd/system -name 'rpi*' -print -delete
 find @root/etc/systemd/system -type d -empty -print -delete
 
 
-echo $THE_HOSTNAME > @root/etc/hostname
+echo $THE_HOSTNAME >| @root/etc/hostname
 ln -sf /usr/share/zoneinfo/Australia/Sydney @root/etc/localtime
-echo > @root/etc/motd
+echo -n >| @root/etc/motd
 
 
 cp ~/monosys/etc/ssh/sshd_config @root/etc/ssh/sshd_config
@@ -62,8 +64,8 @@ dpkg-reconfigure raspi-firmware
 apt-get update
 apt-get install locales
 dpkg-reconfigure locales
-apt-get install aptitude curl git python3 vim
 
+apt-get install aptitude curl git python3 vim
 curl -sSfL https://code.delx.au/p/dotfiles | bash
 exit
 ssh root@192.168.1.XXX
@@ -77,7 +79,7 @@ cp monosys/etc/systemd/network/ethernet.network /etc/systemd/network/
 systemctl stop networking ; systemctl restart systemd-networkd
 systemctl disable networking ; systemctl enable systemd-networkd
 
-
+apt-get install aptitude
 mkdir /root/monosys/package-lists/local
 ln -s /root/monosys/package-lists/local /root/.aptorphan
 cd /root/monosys/package-lists/local

diff --git a/notes/snapper.txt b/notes/snapper.txt
index 072ac9b9b7cf81ab1994b0200ac4a2edf9cd6b49..add31594f4407bdf7e92c0af0b1588ef9e4e1f3a 100644 (file)
--- a/notes/snapper.txt
+++ b/notes/snapper.txt
@@ -1,5 +1,5 @@
 snapper -c root create-config /
-snapper -c home create-config /home
+snapper -c $USERNAME create-config /home/$USERNAME
 
 vim /etc/snapper/configs/*
 ```

diff --git a/package-lists/arch/desktop-gnome b/package-lists/arch/desktop-gnome
index 09e2c2c8891a3eecbd65401a7fb87abbc53fdcd3..9c65ebebb31d0f55d1d43b53873aa4960be76c3e 100644 (file)
--- a/package-lists/arch/desktop-gnome
+++ b/package-lists/arch/desktop-gnome
@@ -36,5 +36,6 @@ sushi
 tracker3
 tracker3-miners
 qt5-wayland
+qt6-wayland
 wl-clipboard
 xdg-desktop-portal-gnome

diff --git a/package-lists/arch/multimedia-players b/package-lists/arch/desktop-video
similarity index 100%
rename from package-lists/arch/multimedia-players
rename to package-lists/arch/desktop-video

diff --git a/package-lists/arch/multimedia-cd b/package-lists/arch/multimedia-cd
deleted file mode 100644 (file)
index b5a5320..0000000
--- a/package-lists/arch/multimedia-cd
+++ /dev/null
@@ -1,3 +0,0 @@
-abcde
-cdparanoia
-glyr

diff --git a/package-lists/arch/multimedia-dvd b/package-lists/arch/multimedia-dvd
deleted file mode 100644 (file)
index 04c347b..0000000
--- a/package-lists/arch/multimedia-dvd
+++ /dev/null
@@ -1,2 +0,0 @@
-dvdbackup
-libdvdcss

diff --git a/package-lists/arch/system b/package-lists/arch/system
deleted file mode 100644 (file)
index fd9f881..0000000
--- a/package-lists/arch/system
+++ /dev/null
@@ -1,19 +0,0 @@
-# bootloader
-efibootmgr
-grub
-
-# kernel/drivers
-intel-ucode
-linux-lts
-linux-firmware
-terminus-font # Linux VT
-tlp
-
-# filesystems
-cryptsetup
-zfs-linux-lts
-
-# networking
-crda
-iw
-networkmanager

diff --git a/package-lists/arch/system-efi-amd64 b/package-lists/arch/system-efi-amd64
new file mode 100644 (file)
index 0000000..7a6d312
--- /dev/null
+++ b/package-lists/arch/system-efi-amd64
@@ -0,0 +1,8 @@
+# bootloader
+efibootmgr
+grub
+
+# kernel/drivers
+intel-ucode
+linux-firmware
+linux-lts

diff --git a/package-lists/arch/multimedia-transcoding b/package-lists/arch/transcoding
similarity index 88%
rename from package-lists/arch/multimedia-transcoding
rename to package-lists/arch/transcoding
index c3b42d87e6d7c86f0869fa02c56548a35a965b42..bd1a38b5648a7999811416dc4b6f92cb9c682da9 100644 (file)
--- a/package-lists/arch/multimedia-transcoding
+++ b/package-lists/arch/transcoding
@@ -1,4 +1,5 @@
 atomicparsley
+libdvdcss
 exiv2
 fdkaac
 ffmpeg

diff --git a/package-lists/debian/desktop-printing b/package-lists/debian/desktop-printing
index 817cbc01eca92d3f859c7ca5b3efe7abc0bde5be..c5b2986503794ed34dc7b34f8c9d0ad0366cf98f 100644 (file)
--- a/package-lists/debian/desktop-printing
+++ b/package-lists/debian/desktop-printing
@@ -1,3 +1,5 @@
 avahi-daemon
 libnss-mdns
 cups
+cups-pk-helper
+system-config-printer

diff --git a/package-lists/debian/multimedia-players b/package-lists/debian/desktop-video
similarity index 100%
rename from package-lists/debian/multimedia-players
rename to package-lists/debian/desktop-video

diff --git a/package-lists/debian/multimedia-cd b/package-lists/debian/multimedia-cd
deleted file mode 100644 (file)
index 00dedf6..0000000
--- a/package-lists/debian/multimedia-cd
+++ /dev/null
@@ -1 +0,0 @@
-abcde

diff --git a/package-lists/debian/multimedia-dvd b/package-lists/debian/multimedia-dvd
deleted file mode 100644 (file)
index 04c347b..0000000
--- a/package-lists/debian/multimedia-dvd
+++ /dev/null
@@ -1,2 +0,0 @@
-dvdbackup
-libdvdcss

diff --git a/package-lists/debian/multimedia-transcoding b/package-lists/debian/multimedia-transcoding
deleted file mode 100644 (file)
index 7308254..0000000
--- a/package-lists/debian/multimedia-transcoding
+++ /dev/null
@@ -1,8 +0,0 @@
-atomicparsley
-exiv2
-fdkaac
-ffmpeg
-handbrake-cli
-imagemagick
-mkvtoolnix
-sox