5 files changed, 90 insertions, 106 deletions
diff --git a/guides/setups/dell-3190/debian-buster.org b/guides/setups/devices/dell-3190.org
index 215374f..215374f 100644
--- a/guides/setups/dell-3190/debian-buster.org
+++ b/guides/setups/devices/dell-3190.org
diff --git a/guides/setups/devices/samsung-nc10.org b/guides/setups/devices/samsung-nc10.org
new file mode 100644
index 0000000..2f8fc10
--- /dev/null
+++ b/guides/setups/devices/samsung-nc10.org
@@ -0,0 +1,38 @@
+* Debian Buster installation
+Installer does not recognize the touchpad, for some reason.
+* First boot
+#+BEGIN_QUOTE
+A start job is running for Load AppArmor profiles
+#+END_QUOTE
+Disappeared after ≈30s 🤷
+
+Wooh touchpad works!  Although the sensitivity is a bit low.
+
+Wifi LED is on, whatever that means.
+
+Brightness function keys do not work on the login screen.
+
+Using default XFCE config to get four workspaces.
+
+Brightness and sound function keys work! 🙌
+
+Touchpad click and scroll do not work.
+
+Wifi function key does not work.
+
+Battery life seems somewhat shorter than with Bunsenlabs, even after
+applying all powertop tricks in the book.
+* Someday
+** fix Ethernet after suspend
+Workaround:
+#+BEGIN_SRC sh
+$ sudo modprobe -r sky2 && sudo modprobe -i sky2
+#+END_SRC
+
+References:
+- https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1841304
+- https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=895378
+- https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1798921
+- https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1809843
+- https://askubuntu.com/questions/1029620/ubuntu-18-04-lts-sky2-ethernet-stops-working-after-system-resume-from-suspend
+- https://bbs.archlinux.org/viewtopic.php?id=234725
diff --git a/guides/setups/operating-systems/bunsenlabs.org b/guides/setups/operating-systems/bunsenlabs.org
new file mode 100644
index 0000000..578bcbe
--- /dev/null
+++ b/guides/setups/operating-systems/bunsenlabs.org
@@ -0,0 +1,39 @@
+* Keyboard
+Cf. keyboard(5):
+
+- add =ctrl:nocaps= in =/etc/default/keyboard=
+- run =udevadm trigger --subsystem-match=input --action=change=
+- run =setupcon= in a TTY
+
+* Desktop
+** Conky
+- see dotfiles
+
+** ClipIt
+- disable hotkeys
+
+** Openbox
+*** =rc.xml=
+- comment A-m and A-r out
+- undecorate all windows:
+
+#+begin_src xml
+<application class="*">
+  <decor>no</decor>
+</application>
+#+end_src
+
+*** WM preferences
+- appearance: uncheck "windows retain a border when undecorated"
+- desktops: 4
+
+** tint2
+- remove launcher and exit panel items
+- add date (time2)
+
+** Calendar
+Make weeks begin on Monday by using the British locale:
+
+- uncomment =en_GB.UTF-8 UTF-8= in /etc/locale.gen
+- =sudo locale-gen=
+- =force_lang = en_GB.utf8= in =~/.config/gsimplecal/config=
diff --git a/guides/setups/samsung-nc10/debian-buster.org b/guides/setups/operating-systems/debian.org
index b48e2a8..a3142f0 100644
--- a/guides/setups/samsung-nc10/debian-buster.org
+++ b/guides/setups/operating-systems/debian.org
@@ -1,35 +1,11 @@
-* Installation
-Installer does not recognize the touchpad, for some reason.
-
-* First boot
-#+BEGIN_QUOTE
-A start job is running for Load AppArmor profiles
-#+END_QUOTE
-Disappeared after ≈30s 🤷
-
-Wooh touchpad works!  Although the sensitivity is a bit low.
-
-Wifi LED is on, whatever that means.
-
-Brightness function keys do not work on the login screen.
-
-Using default config to get four workspaces.
-
-Brightness and sound function keys work! 🙌
-
-Touchpad click and scroll do not work.
-
-Wifi function key does not work.
-
 * Getting comfortable
-** CapsLock
-Tweak /etc/default/keyboard to remap CapsLock as secondary
-Control, then in a TTY:
+** Make CapsLock another Control
+Cf. keyboard(5):
+
+- add =ctrl:nocaps= in =/etc/default/keyboard=
+- run =udevadm trigger --subsystem-match=input --action=change=
+- run =setupcon= in a TTY
 
-#+BEGIN_SRC sh
-$ sudo udevadm trigger --subsystem-match input --action change
-$ sudo setupcon
-#+END_SRC
 ** apt install (1/n)
 git greybird-gtk-theme elementary-xfce-icon-theme emacs
 
@@ -83,9 +59,8 @@ $ sudo sed -ri 's/security\.debian\.org/deb.debian.org/' /etc/apt/sources.list
 [[https://wiki.debian.org/SourcesList#Example_sources.list][🤷]]
 
 ** Clone dotfiles
-Allow external drives to be automounted: cf. Thunar section below.
-
-Grab ssh keys from backup.  "Clone" (init, fetch, reset) dotfiles.
+Generate SSH keys and add them to GitLab through the web UI.  "Clone"
+(init, add remote, fetch, reset) dotfiles.
 
 ** Tweak dotfiles
 Set EMAIL in .profile; copy .profile to .xsessionrc (AFAICT XFCE does
@@ -221,11 +196,6 @@ elementary Xfce darker
 - xfce4-session-logout: Super+X
 - xflock4: Super+L
 
-** Work on battery life
-Somewhat shorter than with BunsenLabs…
-
-Write script to apply powertop advice.
-
 ** Install more stuff
 aspell-fr ffmpeg gimp vlc wordnet
 *** CLI tools
@@ -265,28 +235,15 @@ adduser ${USER} dialout, so I can sync my phone.
     #+BEGIN_SRC sh
     $ sudo update-alternatives --install $(which x-www-browser) x-www-browser \
                                ${SOMEWHERE}/firefox/firefox 1
+    $ sudo update-alternatives --set x-www-browser ${SOMEWHERE}/firefox/firefox
     $ ln -s ${SOMEWHERE}/firefox/firefox ~/.local/bin/
     #+END_SRC
 
-- paste backuped configuration into ~/.mozilla/firefox
+- paste backuped configuration into ~/.mozilla/firefox/${profile}
 * Someday
 ** fix xfce4-terminal opening links with firefox-esr
 ** fix Thunar opening images with Firefox instead of Ristretto
 ** fix Ristretto thumbnails
-** fix Ethernet after suspend
-Workaround:
-#+BEGIN_SRC sh
-$ sudo modprobe -r sky2 && sudo modprobe -i sky2
-#+END_SRC
-
-References:
-- https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1841304
-- https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=895378
-- https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1798921
-- https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1809843
-- https://askubuntu.com/questions/1029620/ubuntu-18-04-lts-sky2-ethernet-stops-working-after-system-resume-from-suspend
-- https://bbs.archlinux.org/viewtopic.php?id=234725
-
 ** setup fonts
 #+BEGIN_SRC html
 <head>
@@ -300,6 +257,6 @@ References:
 - apt install fonts-noto-color-emoji
 - mousepad and xfce4-terminal seem to pick the font up out of the box
 - Firefox 69 displays ☺ with DejaVu Sans Mono
-- Emacs 27 with =(set-fontset-font t nil "Noto Color Emoji")= can
-  display everything with Noto Color Emoji except ☺, which remains
-  with DejaVu Sans Mono
+- Emacs 27 with =(set-fontset-font t nil "Noto Color Emoji")= and
+  use-default-font-for-symbols nil can display everything with Noto
+  Color Emoji
diff --git a/guides/setups/samsung-nc10/busenlabs-helium.md b/guides/setups/samsung-nc10/busenlabs-helium.md
deleted file mode 100644
index 8950c29..0000000
--- a/guides/setups/samsung-nc10/busenlabs-helium.md
+++ /dev/null
@@ -1,50 +0,0 @@
-# Keyboard
-
-Cf. keyboard(5):
-
-- add `ctrl:nocaps` in /etc/default/keyboard
-- run `udevadm trigger --subsystem-match=input --action=change`
-- run `setupcon` in a TTY
-
-# Desktop
-
-## Conky
-
-- changed window type to "desktop" so that W-d does not hide Conky
-- see dotfiles
-
-## ClipIt
-
-- disable hotkeys
-
-## Openbox
-
-### `rc.xml`
-
-- comment A-m and A-r out
-- undecorate all windows:
-
-    ``` xml
-    <application class="*">
-      <decor>no</decor>
-    </application>
-    ```
-
-### WM preferences
-
-- appearance: uncheck "windows retain a border when undecorated"
-- desktops: 4
-
-## tint2
-
-- remove launcher and exit panel items
-- add date (time2)
-
-## Calendar
-
-Make weeks begin on Monday by using the British locale:
-
-- uncomment `en_GB.UTF-8 UTF-8` in /etc/locale.gen
-- `sudo locale-gen`
-- `force_lang = en_GB.utf8` in `~/.config/gsimplecal/config`
-