From ffc5d2c722e5a00e34f5098150df6e7828d4a3c0 Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Mon, 8 Jun 2026 11:45:55 -0700
Subject: Update MacOS setup

---
 GNUmakefile | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

(limited to 'GNUmakefile')

diff --git a/GNUmakefile b/GNUmakefile
index 143afe4..a15d00f 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -48,11 +48,11 @@ picom-clean:
 
 ## Emacs
 
-before-emacs-install: emacs/.config/emacs/init.elc
+before-emacs-install: emacs/.emacs.d/init.elc
 
 emacs-clean:
-	rm -f emacs/.config/shepherd/init.d/emacs.scm emacs/.config/emacs/init.el \
-	    emacs/.config/emacs/init.elc
+	rm -f emacs/.config/shepherd/init.d/emacs.scm emacs/.emacs.d/init.el \
+	    emacs/.emacs.d/init.elc
 
 ## Xmodmap
 
@@ -159,7 +159,7 @@ surfingkeys/dist/punt.js: surfingkeys/punt.ts surfingkeys/home.ts
 
 ## Diamond Interactive MacOS
 
-diamond-interactive: ssh-keygen brew-install wezterm-install glide-install git-install emacs-install
+diamond-interactive: ssh-keygen brew-install wezterm-install glide-install git-install zsh-install _mbsetupuser-install change-macos-defaults
 
 ssh-keygen: $(HOME)/.ssh/id_ed25519.pub
 
@@ -169,12 +169,26 @@ $(HOME)/.ssh/id_ed25519.pub:
 brew-install: _mbsetupuser/Brewfile
 	brew bundle --file $^
 
+before-_mbsetupuser-install: _mbsetupuser/.emacs.d/init.elc
+
+_mbsetupuser/.config/zsh/conf.d/postgresql.sh: _mbsetupuser/Brewfile
+	$(call tangle,shell)
+
+_mbsetupuser/.emacs.d/init.el: emacs/.emacs.d/init.el emacs/.emacs.d/oni-outline.el
+	mkdir -p $$(dirname $@)
+	cat $^ >> $@
+
 project-directories: \
     $(HOME)/code/personal/ \
     $(HOME)/code/diamond-interactive/ \
     $(HOME)/code/foreign/ \
     $(HOME)/code/study/
 
+change-macos-defaults:
+# https://macos-defaults.com/dock/autohide.html
+	defaults write com.apple.dock "autohide" -bool "true"
+	killall Dock
+
 # Local Variables:
 # outline-regexp: "##+"
 # End:
-- 
cgit v1.3-2-g0d8e