From bc229b306ff99a977b5f825266a60431d260456e Mon Sep 17 00:00:00 2001
From: u <u@billy>
Date: Mon, 10 Jan 2022 17:21:42 -0500
Subject: rootfs fixes & improvements; now using Debian bullseye

Probably breaks Debian buster, which probably won't be fixed.
---
 rootfs/dpkg.yaml           |  2 +-
 rootfs/samizdat-skel.yaml  | 72 +++++++++++++++++++++++++++++++++++++++
 rootfs/samizdat-wip.yaml   | 85 ++++++----------------------------------------
 rootfs/samizdat.patch.yaml |  3 +-
 rootfs/samizdat.yaml       | 15 +-------
 5 files changed, 87 insertions(+), 90 deletions(-)
 create mode 100644 rootfs/samizdat-skel.yaml

diff --git a/rootfs/dpkg.yaml b/rootfs/dpkg.yaml
index 7478fe2..bffbf26 100644
--- a/rootfs/dpkg.yaml
+++ b/rootfs/dpkg.yaml
@@ -1,4 +1,4 @@
-parent: samizdat-wip
+parent: samizdat-skel
 chroot-commands:
 #- "DEBIAN_FRONTEND=noninteractive apt-get -f install; true"
 - "true"
diff --git a/rootfs/samizdat-skel.yaml b/rootfs/samizdat-skel.yaml
new file mode 100644
index 0000000..52cae83
--- /dev/null
+++ b/rootfs/samizdat-skel.yaml
@@ -0,0 +1,72 @@
+parent: samizdat-wip
+binaries:
+- btrfs-shrink
+- cokiki
+- fsmgr
+- git-ll-remote
+- hosts
+- kiki
+- samizdat-daily-snapshot-root
+- samizdat-diff-root
+- selfstrap
+- stack
+binaries-optional:
+- dht
+- dhtd
+- rustup
+
+skel-files:
+- .xinitrc
+- .bashrc
+- .xbindkeysrc
+- .tmux.conf
+- .tmux.stage2.conf
+- .vimrc
+- .Xresources
+
+skel-files-optional:
+- .config/git/ignore
+- .gitconfig # This embeds my email address so not really suitable permanently.
+- .spacemacs
+
+# keymap control/recue
+- '.local/bin/asdf'
+- '.local/bin/aoeu'
+- '.local/bin/ASDF'
+- '.local/bin/dvorak'
+- '.local/bin/qwer'
+- '.local/bin/асдф'
+
+# misc. programs/scripts I wrote
+- '.local/bin/amixer-enable-mic'
+- '.local/bin/axis'
+- '.local/bin/datel'
+- '.local/bin/google'
+- '.local/bin/hard-restart-wifi'
+- '.local/bin/interactive-rename'
+- '.local/bin/jack-plumbing'
+- '.local/bin/linlaunch'
+- '.local/bin/lptext'
+- '.local/bin/midi-dump'
+- '.local/bin/musopen'
+- '.local/bin/pavol'
+- '.local/bin/pdf-autoprint'
+- '.local/bin/restart-linux-device'
+- '.local/bin/safeunrar'
+- '.local/bin/sliceweasel'
+- '.local/bin/thinkpad-rotate'
+- '.local/bin/x11-ssh-host'
+- '.local/bin/xtermessage'
+- '.local/bin/xvnc'
+
+# ffmpeg wrappers
+- '.local/bin/record'
+- '.local/bin/screeny'
+- '.local/bin/selfie'
+- '.local/bin/soundy'
+- '.local/bin/vseg'
+- '.local/bin/webbie'
+- '.local/bin/webm'
+
+# also this (but is it even used?)
+#- '.local/bin/xmonad'
diff --git a/rootfs/samizdat-wip.yaml b/rootfs/samizdat-wip.yaml
index 710480d..6ea314b 100644
--- a/rootfs/samizdat-wip.yaml
+++ b/rootfs/samizdat-wip.yaml
@@ -3,88 +3,25 @@ packages:
 
 - cron
 - dnsutils
-- emacs25
+- emacs
 - gpm
+- linux-image-$(kver)-$(karch)
 - net-tools
 - parted
 - procps
+- ssh
 - sshfs
 - wireless-tools
 
 # these are dependencies of 'axis':
-- 'libsdl-ttf2.0-0'
-- 'libsdl-gfx1.2-5'
-- 'fonts-liberation'
+- libsdl-ttf2.0-0
+- libsdl-gfx1.2-5
+- fonts-liberation
 
-- 'ffmpeg' # record, selfie, webm, vseg
-- 'jq' # musopen
-- 'curl' # musopen
-- 'miniupnpc' # linlaunch
-- 'jackd' # jack-plumbing
-- 'pulseaudio' # pavol
-- 'pulseaudio-module-jack'
-# - 'pulseaudio-module-bluetooth'
+- ffmpeg # record, selfie, webm, vseg
+- jq # musopen
+- curl # musopen
+- miniupnpc # linlaunch
 
-- 'xserver-xorg-input-wacom'
+- xserver-xorg-input-wacom
 
-binaries:
-- stack
-binaries-optional:
-- rustup
-
-skel-files-optional:
-- '.bashrc'
-- '.config/git/ignore'
-- '.gitconfig' # This embeds my email address so not really suitable
-               # permanently.
-- '.spacemacs'
-- '.tmux.conf'
-- '.tmux.stage2.conf'
-- '.vimrc'
-- '.xbindkeysrc'
-- '.xinitrc'
-
-- '.Xresources'
-
-# keymap control/recue
-- '.local/bin/asdf'
-- '.local/bin/aoeu'
-- '.local/bin/ASDF'
-- '.local/bin/dvorak'
-- '.local/bin/qwer'
-- '.local/bin/асдф'
-
-# misc. programs/scripts I wrote
-- '.local/bin/amixer-enable-mic'
-- '.local/bin/axis'
-- '.local/bin/datel'
-- '.local/bin/fsmgr'
-- '.local/bin/google'
-- '.local/bin/hard-restart-wifi'
-- '.local/bin/interactive-rename'
-- '.local/bin/jack-plumbing'
-- '.local/bin/linlaunch'
-- '.local/bin/lptext'
-- '.local/bin/midi-dump'
-- '.local/bin/musopen'
-- '.local/bin/pavol'
-- '.local/bin/pdf-autoprint'
-- '.local/bin/restart-linux-device'
-- '.local/bin/safeunrar'
-- '.local/bin/sliceweasel'
-- '.local/bin/thinkpad-rotate'
-- '.local/bin/x11-ssh-host'
-- '.local/bin/xtermessage'
-- '.local/bin/xvnc'
-
-# ffmpeg wrappers
-- '.local/bin/record'
-- '.local/bin/screeny'
-- '.local/bin/selfie'
-- '.local/bin/soundy'
-- '.local/bin/vseg'
-- '.local/bin/webbie'
-- '.local/bin/webm'
-
-# also this (but is it even used?)
-#- '.local/bin/xmonad'
diff --git a/rootfs/samizdat.patch.yaml b/rootfs/samizdat.patch.yaml
index 809736f..51cd688 100644
--- a/rootfs/samizdat.patch.yaml
+++ b/rootfs/samizdat.patch.yaml
@@ -4,7 +4,8 @@ apt-update: true
 binaries:
 - './samizdat-patch-root.sh'
 - './samizdat-hostname.sh'
-- '/usr/bin/selfpublish.sh'
+binaries-optional:
+- 'selfpublish.sh'
 chroot-commands:
 - "/usr/local/bin/samizdat-patch-root.sh"
 - "/usr/local/bin/samizdat-hostname.sh"
diff --git a/rootfs/samizdat.yaml b/rootfs/samizdat.yaml
index 60bdc69..20fec1d 100644
--- a/rootfs/samizdat.yaml
+++ b/rootfs/samizdat.yaml
@@ -1,19 +1,6 @@
-parent: samizdat-wip
+parent: samizdat-skel
 apt-update: true
 unpack-only: false
-binaries:
-- samizdat-diff-root
-- samizdat-daily-snapshot-root
-- kiki
-- cokiki
-- hosts
-- selfstrap
-binaries-optional:
-- dhtd
-- dht
-packages:
-- linux-image-$(kver)-$(karch)
-- ssh
 
 unit-files:
 - rc-local.service
-- 
cgit v1.2.3