From 831662ad4d280c080cd9e1d24190cef38b140357 Mon Sep 17 00:00:00 2001
From: utensil <utensilcandel@gmail.com>
Date: Thu, 31 Oct 2024 11:53:28 +0800
Subject: [PATCH] Improve Amethyst setup

---
 .amethyst.yml       | 29 +++++++++++++++++++++++++++++
 justfile            | 15 +++++++++------
 trees/uts-002G.tree |  8 +++++---
 3 files changed, 43 insertions(+), 9 deletions(-)
 create mode 100644 .amethyst.yml

diff --git a/.amethyst.yml b/.amethyst.yml
new file mode 100644
index 0000000..09710cb
--- /dev/null
+++ b/.amethyst.yml
@@ -0,0 +1,29 @@
+layouts:
+    - bsp
+    - wide
+
+# # First mod (default option + shift).
+# mod1:
+#   - option
+#   - shift
+#   # - control
+#   # - command
+
+# # Second mod (default option + shift + control).
+# mod2:
+#   - option
+#   - shift
+#   - control
+#   # - command
+
+# Automatically quit and reopen Amethyst.
+relaunch-amethyst:
+  mod: mod1
+  key: z
+
+# focus-follows-mouse: true
+
+# screen-padding-top: 10
+enables-layout-hud: false
+enables-layout-hud-on-space-change: false
+
diff --git a/justfile b/justfile
index 661f372..e4bb2f5 100644
--- a/justfile
+++ b/justfile
@@ -218,15 +218,17 @@ sbar:
 
 prep-tile: prep-amethyst
 
-prep-yabai: prep-dotfiles-tmp
-    brew install koekeishiya/formulae/yabai
+prep-skhd: prep-dotfiles-tmp
     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
+    skhd --start-service
+
+prep-yabai: prep-dotfiles-tmp prep-skhd
+    brew install koekeishiya/formulae/yabai
+    rm -rf ~/.config/yabai
+    cp -r {{dotfiletmpdir}}/.config/yabai ~/.config/
+    yabai --start-service
 
 no-yabai:
     yabai --stop-service
@@ -234,6 +236,7 @@ no-yabai:
 
 prep-amethyst:
     brew install --cask amethyst
+    cp -f .amethyst.yml ~/.amethyst.yml
 
 # act:
 #     ./act.sh
diff --git a/trees/uts-002G.tree b/trees/uts-002G.tree
index 972ebe9..86be194 100644
--- a/trees/uts-002G.tree
+++ b/trees/uts-002G.tree
@@ -10,6 +10,8 @@ Setup:
 
 - Use [SketchyBar](https://github.com/FelixKratz/SketchyBar)
 - Use `just prep-sbar` to setup SketchyBar
+- Use `just prep-skhd` to setup some extra key bindings
+    - `Shift + Alt + space`: toggle sketchbar
 - Modify `~/.config/sketchybar/bar.lua` as follows:
 
 ```lua
@@ -34,11 +36,12 @@ Setup:
 
 Keys:
 
-- `Option + Shift + Space` to cycle through layouts, prefer Tall
+- `Option + Shift + Space` to cycle through layouts
+    - I prefer only BSP and wide
 - `Option + Shift + J/K` to cycle through windows
 - `Option + Shift + H/L` to resize windows
 
-Alternative setup:
+Alternative setup (not recommended):
 
 - Give [yabai](https://github.com/koekeishiya/yabai) another shot
     - requires skhd for key bindings
@@ -48,7 +51,6 @@ Alternative setup:
 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