From 55eb9ddb6da2a3729b4dbbb9ce1c4e93847738e6 Mon Sep 17 00:00:00 2001
From: Christian Heller <c.heller@plomlompom.de>
Date: Thu, 13 Jan 2022 04:48:42 +0100
Subject: [PATCH] Fix desktop setup.

---
 bullseye/apt-mark/desktop |  9 -----
 bullseye/apt-mark/user    | 75 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 75 insertions(+), 9 deletions(-)
 create mode 100644 bullseye/apt-mark/user

diff --git a/bullseye/apt-mark/desktop b/bullseye/apt-mark/desktop
index 2b1dade..f537318 100644
--- a/bullseye/apt-mark/desktop
+++ b/bullseye/apt-mark/desktop
@@ -1,11 +1,2 @@
 # so that grub learns about kernel updates
 grub-pc
-# needed by setup script
-wget
-unzip
-jq
-pmount
-cryptsetup
-borgbackup
-isync
-notmuch
diff --git a/bullseye/apt-mark/user b/bullseye/apt-mark/user
new file mode 100644
index 0000000..70fa829
--- /dev/null
+++ b/bullseye/apt-mark/user
@@ -0,0 +1,75 @@
+# to avoid booting problems with encrypted LVM, see <https://askubuntu.com/a/1105848>
+cryptsetup-initramfs
+lvm2
+# this provides setupcon which reads /etc/default/console-setup
+console-setup
+# without this, systemd-logind won't run, and so not detect lid close for hibernation
+dbus
+# for wifi
+wicd-curses
+wicd-gtk
+# for X to start at all
+xserver-xorg-video-intel
+# X input: keyboard and touchpad
+xserver-xorg-input-evdev
+xserver-xorg-input-synaptics
+# for startx
+xinit
+# for xrdb
+x11-xserver-utils
+# for startx to run for non-root user
+libpam-systemd
+# window environment
+i3
+i3status
+suckless-tools
+xterm
+# to get sleepy at night
+redshift
+# for alsamixer
+alsa-utils
+# for xterm and browser unicode display
+ttf-unifont
+# also useful
+vim
+sudo
+less
+man-db
+manpages
+procps
+# firefox dependencies
+libdbus-glib-1-2
+libgtk-3-0
+# firefox installation dependencies (remove later?)
+curl
+python3
+bzip2
+wget
+jq
+unzip
+# to mount encrypted USB stick and use its contents
+pmount
+cryptsetup
+openssh-client
+# for syncing
+borgbackup
+# emacs
+emacs27
+emacs-common-non-dfsg
+emacs-el
+elpa-ledger
+ledger
+elpa-elfeed
+# mail setup
+isync
+notmuch
+elpa-notmuch
+pinentry-gtk2
+# to mount Android phone
+go-mtpfs
+# to use HP Deskjet F380 scanner from GIMP
+sane-utils
+xsane
+# to use HP Deskjet F380 printer
+cups
+#
-- 
2.30.2