cleaning up hostname handling

README.md

@@ -1,11 +1,19 @@
 # dotfiles
 
+## hostnames
+
+- `rattusrattus`: macbook
+- `yersiniapestis`: wsl (debian)
+- `devterm`: devterm (debian)
+
 1) set the fqdn (this is necessary for some of the host-specific chezmoi config):
 
 ```bash
-# debian
+# debian standalone
 sudo hostnamectl set-hostname $MY_HOSTNAME.local
-# or don't worry about it on WSL machines
+
+# debian wsl
+echo "[network]\nhostname = $MY_HOSTNAME" | sudo tee -a /etc/wsl.conf
 
 # macos
 sudo scutil --set HostName $MY_HOSTNAME.local
@@ -27,11 +35,14 @@ xcode-select --install
 # TODO: is there a reasonable unattended install workflow for macports?
 ```
 
-3) set the shell (linux-only):
+3) set the initial shell:
 
 ```bash
 # debian
 chsh -s $(which zsh)
+
+# macos
+# NA
 ```
 
 4) install a patched font, [Anonymice Pro](https://www.nerdfonts.com/font-downloads).
@@ -50,9 +61,12 @@ sh -c "$(curl -fsLS get.chezmoi.io)" -- \
   --guess-repo-url=false
 ```
 
-7) set the shell (mac-only):
+7) set the new shell (in case installing from 3rd-party package manager):
 
 ```bash
+# debian
+# NA
+
 # macos
 sudo chpass -s '/opt/local/bin/zsh' $USER
 ```

foo.txt

@@ -0,0 +1,3 @@
+[network]
+hostname = yersiniapestis
+

home/.chezmoi.toml.tmpl

@@ -2,3 +2,11 @@ encryption = "age"
 [age]
     identity = "~/.key.txt"
     recipient = "age1yd87u4ae86erpem2tynyl959ppc8a3jt4ztssykytzaklut6uvus5prt2t"
+
+{{- $hostname = .chezmoi.hostname -}}
+{{- if eq .chezmoi.os "darwin" -}}
+{{-  $hostname := output "scutil" "--get" "ComputerName" | trim -}}
+{{- end -}}
+
+[data]
+    hostname = {{ $hostname | quote }}

home/dot_zshrc.tmpl

@@ -2,7 +2,7 @@ srcs=(
   "${ZDOTDIR:-$HOME}/.zprezto/init.zsh"
   "/opt/miniconda3/etc/profile.d/conda.sh"
   "$HOME/.cargo/env"
-  {{ if eq .chezmoi.os "darwin" -}}
+  {{ if eq .chezmoi.hostname "rattusrattus" -}}
   "$HOME/.zshemulateenergy"
   {{- end }}
 )
@@ -20,7 +20,7 @@ BASE16_SHELL="$HOME/.config/base16-shell/"
 
 alias i="ipython3"
 
-{{ if eq .chezmoi.os "darwin" -}}
+{{ if eq .chezmoi.hostname "rattusrattus" -}}
 alias colima_start="colima start --vm-type vz --mount-type virtiofs"
 {{- end }}
 

home/private_dot_ssh/config.tmpl

@@ -1,3 +1,3 @@
-{{ if eq .chezmoi.os "darwin" -}}
+{{ if eq .chezmoi.hostname "rattusrattus" -}}
 Include /Users/matthew/.colima/ssh_config
-{{ end }}
+{{ end }}

home/run_once_install-packages.sh.tmpl

@@ -12,7 +12,7 @@ sudo apt install \
   wget \
   zsh \
   -y
-{{ else if eq .chezmoi.os "darwin" -}}
+{{ else if eq .chezmoi.hostname "rattusrattus" -}}
 #!/bin/sh
 sudo port install \
   colima \
@@ -27,7 +27,7 @@ sudo port install \
   wget \
   zellij \
   zsh
-{{ else if eq .chezmoi.hostname "DESKTOP-R0KQMF4" -}}
+{{ else if eq .chezmoi.hostname "yersiniapestis" -}}
 #!/bin/sh
 sudo apt update
 sudo apt install \
@@ -42,5 +42,5 @@ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs -o /tmp/rustup.sh && c
 git clone https://github.com/helix-editor/helix.git --branch 23.05 $HOME/.src/helix
 export PATH=$PATH:$HOME/.cargo/bin && cd $HOME/.src/helix && cargo install --path helix-term --locked && hx --grammar fetch && hx --grammar build
 
-git clone ssh://git@pingo.thermokar.st/gwar $HOME/.src/gwar && cd $HOME/.src/gwar && cargo build --release && cp target/release/gwar ~/bin
+# git clone ssh://git@pingo.thermokar.st/gwar $HOME/.src/gwar && cd $HOME/.src/gwar && cargo build --release && cp target/release/gwar ~/bin
 {{ end }}