From a1f3ba6c8a9761933e073ebfc3efc576dd7c7848 Mon Sep 17 00:00:00 2001
From: Ambrose Chua <ambrose@hey.com>
Date: Wed, 17 Mar 2021 03:07:56 +0800
Subject: [PATCH] Update macOS instruction and use brew for a few more packages

---
 .config/yadm/bootstrap |  7 ++++++-
 .github/README.md      | 44 ++++++++++++------------------------------
 2 files changed, 18 insertions(+), 33 deletions(-)

diff --git a/.config/yadm/bootstrap b/.config/yadm/bootstrap
index 2315dd4..5c0af3c 100755
--- a/.config/yadm/bootstrap
+++ b/.config/yadm/bootstrap
@@ -174,6 +174,7 @@ esac
 packages_add neovim git
 $nicetohave && packages_add pass gnupg
 case $ID in
+	macos) packages_add pinentry-mac;
 	alpine) packages_add dropbear-ssh;;
 	fedora) packages_add openssh-clients;;
 	debian|ubuntu) packages_add openssh-client;;
@@ -207,10 +208,14 @@ packages_install
 # Install Python 3 packages
 
 case $ID in
+	macos) $nicetohave && packages_add httpie;;
 	alpine) packages_add httpie;;
 	*) pip3 install --no-cache-dir --user httpie;;
 esac
-$nicetohave && pip3 install --no-cache-dir --user thefuck
+case $ID in
+	macos) $nicetohave && packages_add thefuck;;
+	*) $nicetohave && pip3 install --no-cache-dir --user thefuck;;
+esac
 
 # Install Golang
 
diff --git a/.github/README.md b/.github/README.md
index 051987d..b864608 100644
--- a/.github/README.md
+++ b/.github/README.md
@@ -17,47 +17,27 @@ Just storing dotfiles in a repository isn't enough. This is almost all the tools
 
 ```sh
 export PATH="$HOME/.local/bin:$PATH"
-curl -fLo ~/.local/bin/runenv https://raw.githubusercontent.com/serverwentdown/env/master/.local/bin/runenv
-chmod +x ~/.local/bin/runenv
-runenv -h
+curl -fLo ~/.local/bin/contain https://raw.githubusercontent.com/serverwentdown/env/master/.local/bin/contain
+chmod +x ~/.local/bin/contain
+contain -h
 ```
 
-### macOS
+### macOS, Fedora, Alpine, Ubuntu, Debian
+
+[Install yadm](https://yadm.io/docs/install), and then clone.
 
 ```sh
-brew install \
-	xz upx \
-	\
-	zsh-autosuggestions \
-	zsh-syntax-highlighting \
-	exa jq \
-	neovim \
-	\
-	git \
-	pass gnupg \
-	\
-	python@3.9 \
-	go \
-	\
-	thefuck \
-	httpie \
-	dust \
-	yadm \
-	\
-	kubectl \
-	minio/stable/mc \
-	\
-	pinentry-mac
-
-
+# Install yadm (macOS)
+brew install yadm
+# Install yadm (dirty method)
+curl -fLo ~/.local/bin/yadm https://github.com/TheLocehiliosan/yadm/raw/master/yadm
+chmod +x /usr/local/bin/yadm
+# Clone
 yadm clone git@github.com:serverwentdown/env.git
 ```
 
 ## Optional
 
 ```sh
-# requires private key
-yadm decrypt
-# requires yadm decrypt
 git clone git@makerforce.io:ambrose/pass.git ~/.password-store
 ```