From 7a0bf2bfd1444702ce2dbeb6c7b9ab6b759e1194 Mon Sep 17 00:00:00 2001
From: utensil <utensilcandel@gmail.com>
Date: Thu, 31 Oct 2024 11:23:51 +0800
Subject: [PATCH] Give yabai another shot, still not ideal

---
 justfile            | 20 ++++++++++++++++----
 trees/uts-002G.tree | 15 +++++++++++++++
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/justfile b/justfile
index b58d701..661f372 100644
--- a/justfile
+++ b/justfile
@@ -203,10 +203,12 @@ prep-sbar:
 # Inspired by https://github.com/FelixKratz/dotfiles
 dotfiletmpdir := "/tmp/dotfiles-" + choose('8', HEX)
 
-config-sbar:
+prep-dotfiles-tmp:
+    git clone https://github.com/FelixKratz/dotfiles {{dotfiletmpdir}}
+
+config-sbar: prep-dotfiles-tmp
     #!/usr/bin/env bash
     rm -rf ~/.config/sketchybar
-    git clone https://github.com/FelixKratz/dotfiles {{dotfiletmpdir}}
     cp -r {{dotfiletmpdir}}/.config/sketchybar ~/.config/
     rm -rf {{dotfiletmpdir}}
     brew services restart felixkratz/formulae/sketchybar
@@ -216,9 +218,19 @@ sbar:
 
 prep-tile: prep-amethyst
 
-prep-yabai:
+prep-yabai: prep-dotfiles-tmp
     brew install koekeishiya/formulae/yabai
-    yabai --start-service
+    brew install koekeishiya/formulae/skhd
+    rm -rf ~/.config/yabai
+    cp -r {{dotfiletmpdir}}/.config/yabai ~/.config/
+    rm -rf ~/.config/skhd
+    cp -r {{dotfiletmpdir}}/.config/skhd ~/.config/
+    yabai --restart-service
+    skhd --restart-service
+
+no-yabai:
+    yabai --stop-service
+    skhd --stop-service
 
 prep-amethyst:
     brew install --cask amethyst
diff --git a/trees/uts-002G.tree b/trees/uts-002G.tree
index 6403b5e..972ebe9 100644
--- a/trees/uts-002G.tree
+++ b/trees/uts-002G.tree
@@ -37,6 +37,21 @@ Keys:
 - `Option + Shift + Space` to cycle through layouts, prefer Tall
 - `Option + Shift + J/K` to cycle through windows
 - `Option + Shift + H/L` to resize windows
+
+Alternative setup:
+
+- Give [yabai](https://github.com/koekeishiya/yabai) another shot
+    - requires skhd for key bindings
+- Use `just prep-yabai` to install yabai
+- Intentionally choose not to disable SIP
+
+Keys:
+
+- Space manipulation won't work with SIP enabled
+- `Shift + Alt + space`: toggle sketchbar
+- keys to switch between windows are confusing
+- `Shift + Alt + s`: change how windows are splitted, prefer use Kitty's own layout management
+- `Ctrl + Alt + g`: toggle gaps between windows, prefer no gap
 }
 
 \mdblock{Terminal}{