summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoru <u@billy>2022-01-10 17:21:42 -0500
committeru <u@billy>2022-01-10 17:22:41 -0500
commitbc229b306ff99a977b5f825266a60431d260456e (patch)
tree2d66740c1875feed9eb00c6ae943322c63a52c08
parentf8d3ae2f03289f52aca72f7e456041e8c18061f0 (diff)
rootfs fixes & improvements; now using Debian bullseye
Probably breaks Debian buster, which probably won't be fixed.
-rw-r--r--rootfs/dpkg.yaml2
-rw-r--r--rootfs/samizdat-skel.yaml72
-rw-r--r--rootfs/samizdat-wip.yaml85
-rw-r--r--rootfs/samizdat.patch.yaml3
-rw-r--r--rootfs/samizdat.yaml15
5 files changed, 87 insertions, 90 deletions
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 @@
1parent: samizdat-wip 1parent: samizdat-skel
2chroot-commands: 2chroot-commands:
3#- "DEBIAN_FRONTEND=noninteractive apt-get -f install; true" 3#- "DEBIAN_FRONTEND=noninteractive apt-get -f install; true"
4- "true" 4- "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 @@
1parent: samizdat-wip
2binaries:
3- btrfs-shrink
4- cokiki
5- fsmgr
6- git-ll-remote
7- hosts
8- kiki
9- samizdat-daily-snapshot-root
10- samizdat-diff-root
11- selfstrap
12- stack
13binaries-optional:
14- dht
15- dhtd
16- rustup
17
18skel-files:
19- .xinitrc
20- .bashrc
21- .xbindkeysrc
22- .tmux.conf
23- .tmux.stage2.conf
24- .vimrc
25- .Xresources
26
27skel-files-optional:
28- .config/git/ignore
29- .gitconfig # This embeds my email address so not really suitable permanently.
30- .spacemacs
31
32# keymap control/recue
33- '.local/bin/asdf'
34- '.local/bin/aoeu'
35- '.local/bin/ASDF'
36- '.local/bin/dvorak'
37- '.local/bin/qwer'
38- '.local/bin/асдф'
39
40# misc. programs/scripts I wrote
41- '.local/bin/amixer-enable-mic'
42- '.local/bin/axis'
43- '.local/bin/datel'
44- '.local/bin/google'
45- '.local/bin/hard-restart-wifi'
46- '.local/bin/interactive-rename'
47- '.local/bin/jack-plumbing'
48- '.local/bin/linlaunch'
49- '.local/bin/lptext'
50- '.local/bin/midi-dump'
51- '.local/bin/musopen'
52- '.local/bin/pavol'
53- '.local/bin/pdf-autoprint'
54- '.local/bin/restart-linux-device'
55- '.local/bin/safeunrar'
56- '.local/bin/sliceweasel'
57- '.local/bin/thinkpad-rotate'
58- '.local/bin/x11-ssh-host'
59- '.local/bin/xtermessage'
60- '.local/bin/xvnc'
61
62# ffmpeg wrappers
63- '.local/bin/record'
64- '.local/bin/screeny'
65- '.local/bin/selfie'
66- '.local/bin/soundy'
67- '.local/bin/vseg'
68- '.local/bin/webbie'
69- '.local/bin/webm'
70
71# also this (but is it even used?)
72#- '.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:
3 3
4- cron 4- cron
5- dnsutils 5- dnsutils
6- emacs25 6- emacs
7- gpm 7- gpm
8- linux-image-$(kver)-$(karch)
8- net-tools 9- net-tools
9- parted 10- parted
10- procps 11- procps
12- ssh
11- sshfs 13- sshfs
12- wireless-tools 14- wireless-tools
13 15
14# these are dependencies of 'axis': 16# these are dependencies of 'axis':
15- 'libsdl-ttf2.0-0' 17- libsdl-ttf2.0-0
16- 'libsdl-gfx1.2-5' 18- libsdl-gfx1.2-5
17- 'fonts-liberation' 19- fonts-liberation
18 20
19- 'ffmpeg' # record, selfie, webm, vseg 21- ffmpeg # record, selfie, webm, vseg
20- 'jq' # musopen 22- jq # musopen
21- 'curl' # musopen 23- curl # musopen
22- 'miniupnpc' # linlaunch 24- miniupnpc # linlaunch
23- 'jackd' # jack-plumbing
24- 'pulseaudio' # pavol
25- 'pulseaudio-module-jack'
26# - 'pulseaudio-module-bluetooth'
27 25
28- 'xserver-xorg-input-wacom' 26- xserver-xorg-input-wacom
29 27
30binaries:
31- stack
32binaries-optional:
33- rustup
34
35skel-files-optional:
36- '.bashrc'
37- '.config/git/ignore'
38- '.gitconfig' # This embeds my email address so not really suitable
39 # permanently.
40- '.spacemacs'
41- '.tmux.conf'
42- '.tmux.stage2.conf'
43- '.vimrc'
44- '.xbindkeysrc'
45- '.xinitrc'
46
47- '.Xresources'
48
49# keymap control/recue
50- '.local/bin/asdf'
51- '.local/bin/aoeu'
52- '.local/bin/ASDF'
53- '.local/bin/dvorak'
54- '.local/bin/qwer'
55- '.local/bin/асдф'
56
57# misc. programs/scripts I wrote
58- '.local/bin/amixer-enable-mic'
59- '.local/bin/axis'
60- '.local/bin/datel'
61- '.local/bin/fsmgr'
62- '.local/bin/google'
63- '.local/bin/hard-restart-wifi'
64- '.local/bin/interactive-rename'
65- '.local/bin/jack-plumbing'
66- '.local/bin/linlaunch'
67- '.local/bin/lptext'
68- '.local/bin/midi-dump'
69- '.local/bin/musopen'
70- '.local/bin/pavol'
71- '.local/bin/pdf-autoprint'
72- '.local/bin/restart-linux-device'
73- '.local/bin/safeunrar'
74- '.local/bin/sliceweasel'
75- '.local/bin/thinkpad-rotate'
76- '.local/bin/x11-ssh-host'
77- '.local/bin/xtermessage'
78- '.local/bin/xvnc'
79
80# ffmpeg wrappers
81- '.local/bin/record'
82- '.local/bin/screeny'
83- '.local/bin/selfie'
84- '.local/bin/soundy'
85- '.local/bin/vseg'
86- '.local/bin/webbie'
87- '.local/bin/webm'
88
89# also this (but is it even used?)
90#- '.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
4binaries: 4binaries:
5- './samizdat-patch-root.sh' 5- './samizdat-patch-root.sh'
6- './samizdat-hostname.sh' 6- './samizdat-hostname.sh'
7- '/usr/bin/selfpublish.sh' 7binaries-optional:
8- 'selfpublish.sh'
8chroot-commands: 9chroot-commands:
9- "/usr/local/bin/samizdat-patch-root.sh" 10- "/usr/local/bin/samizdat-patch-root.sh"
10- "/usr/local/bin/samizdat-hostname.sh" 11- "/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 @@
1parent: samizdat-wip 1parent: samizdat-skel
2apt-update: true 2apt-update: true
3unpack-only: false 3unpack-only: false
4binaries:
5- samizdat-diff-root
6- samizdat-daily-snapshot-root
7- kiki
8- cokiki
9- hosts
10- selfstrap
11binaries-optional:
12- dhtd
13- dht
14packages:
15- linux-image-$(kver)-$(karch)
16- ssh
17 4
18unit-files: 5unit-files:
19- rc-local.service 6- rc-local.service