From 301c156e4cf543b8d605c1279570a13e4427c21f Mon Sep 17 00:00:00 2001
From: Peter Harpending <peterharpending@qpq.swiss>
Date: Sat, 19 Sep 2026 18:58:19 -0700
Subject: [PATCH] update readme with docs about new machine setup

---
 README.md | 197 ++++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 169 insertions(+), 28 deletions(-)

diff --git a/README.md b/README.md
index 81a0be9..ba76f3a 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # about
 
+Most of this should be moved to my personal wiki
+
 This is an "rsync repo tracked with git" for my dotfiles; see
 "context" section at the end for more detail.
 
@@ -9,50 +11,189 @@ to be an active hindrance to my productivity:
 
 # new system config
 
+terminology:
+
+- being-set-up machine = mark
+- already-set-up machine = pilot
+
 ## devuan
 
-- SSH config:
 
-  - copy `id_rsa.pub` from laptop
-  - edit `/etc/ssh/sshd_config` to sane defaults
-  - in particular:
+### SSHD config
 
-    1. disable root login
-    2. disable password login
+- copy `id_rsa.pub` from laptop
+- edit `/etc/ssh/sshd_config` to sane defaults
 
-- sudo: add `pharpend` to `sudo` group:
+in particular:
 
-      # apt install sudo
-      # usermod -aG pharpend sudo
+1. **disable root login**
+2. **disable password login**
 
-- firefox:
-      % sudo apt install firefox
+### sudo
 
-  - rsync firefox passwords
-  - add to firefox
+- add `pharpend` to `sudo` group:
 
-- dotfiles:
+  ```
+  # apt install sudo
+  # usermod -aG pharpend sudo
+  ```
 
-      % sudo apt install git
-      % mkdir ~/gho
-      % cd ~/gho
-      % git clone https://git.harpending.org/pharpend/dotfiles-ii.git
+### firefox
 
-- tmux:
 
-    % sudo apt install tmux
-    % cp ~/gho/dotfiles-ii/tmux.conf ~/.tmux.conf
+```
+% sudo apt install firefox
+```
 
-- zsh:
+- rsync firefox passwords
+- add to firefox
 
-    % sudo apt install zsh zsh-syntax-highlighting
-    % cp ~/gho/dotfiles-ii/zshrc ~/.zshrc
-    % chsh -s /usr/bin/zsh
+### git
 
-- vim:
+```
+% sudo apt install git
+% git config --global init.defaultBranch master
+% git config --global user.name "Peter Harpending"
+% git config --global user.email "peter@harpending.org"
+```
+
+### `git.harpending.org`
+
+- ssh keygen
+
+  ```
+  % ssh-keygen
+  % cat ~/.ssh/id_ed25519.pub
+  ```
+
+- go to `git.harpending.org` on pilot machine, add ssh key to user
+  profile
+
+
+### dotfiles
+
+```
+% mkdir ~/gho
+% cd ~/gho
+% git clone https://git.harpending.org/pharpend/dotfiles-ii.git
+```
+
+### tmux
+
+```
+% sudo apt install tmux
+% cp ~/gho/dotfiles-ii/tmux.conf ~/.tmux.conf
+```
+
+### zsh
+
+```
+% sudo apt install zsh zsh-syntax-highlighting
+% cp ~/gho/dotfiles-ii/zshrc ~/.zshrc
+% chsh -s /usr/bin/zsh
+```
+
+
+### vim
+
+```
+% sudo apt install vim vim-pathogen
+```
+
+```
+% cp -rv ~/gho/dotfiles-ii/vimrc ~/.vimrc
+% cp -rv ~/gho/dotfiles-ii/vim ~/.vim
+```
+
+
+### i3
+
+pulls in i3wm, i3lock, i3status, dunst:
+
+```
+% sudo apt install i3
+% mkdir ~/.i3
+% cp -rv ~/gho/dotfiles-ii/i3/config ~/.i3/config
+% cp -rv ~/gho/dotfiles-ii/i3status.conf ~/.i3status.conf
+```
+
+### fonts
+
+```
+% sudo apt install fonts-liberation fonts-fantasque-sans font-manager
+```
+
+to refresh font cache:
+
+```
+% fc-cache -fv
+```
+
+### terminator
+
+```
+% sudo apt install terminator
+% rsync -avn ~/gho/dotfiles-ii/config/ ~/.config
+```
+
+### terminator
+
+### music
+
+music
+
+  - dry run (for making sure didn't fuck up confusing af slash syntax):
+
+    ```
+    % rsync -avn Music/ pharpend@mark:/home/pharpend/Music
+    ```
+
+  - wet run:
+
+    ```
+    % rsync -av Music/ pharpend@mark:/home/pharpend/Music
+    ```
+
+### `apt install` shell utilities
+
+exhaustive-ish
+
+```
+# apt install\
+    build-essential \
+    gcc \
+    git \
+    rsync \
+    sudo \
+    tmux \
+    tree \
+    vim \
+    vim-pathogen \
+    zsh \
+    zsh-syntax-highlighting \
+```
+
+### `apt install` desktop utilities
+
+
+```
+# apt install\
+    blueman \
+    emacs \
+    firefox \
+    i3 \
+    gthumb \
+    guake \
+    kde-spectacle \
+    mpc \
+    mpd \
+    ncmpcpp \
+    nitrogen \
+    redshift \
+    rxvt-unicode \
+    terminator \
+```
 
-    % sudo apt install vim vim-pathogen
-    % 
 
 
 ## freebsd