From 2fe57f44ac0f32b7ea639410ad89c874cbc9569a Mon Sep 17 00:00:00 2001
From: Danielle McLean <dani@00dani.me>
Date: Thu, 10 Dec 2020 21:27:17 +1100
Subject: [PATCH 1/4] fix: load Yabai's scripting addition as root (required on
 Big Sur)

---
 config/yabai/yabairc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/yabai/yabairc b/config/yabai/yabairc
index 1326f4d..4544b0d 100755
--- a/config/yabai/yabairc
+++ b/config/yabai/yabairc
@@ -1,4 +1,5 @@
 #!/usr/bin/env sh
+sudo yabai --load-sa
 
 # global settings
 yabai -m config mouse_follows_focus          on

From e69da0d1d0420ae8c8b01405479c66ea868b8565 Mon Sep 17 00:00:00 2001
From: Danielle McLean <dani@00dani.me>
Date: Thu, 10 Dec 2020 21:28:29 +1100
Subject: [PATCH 2/4] feat: toggle Stackline icons using an skhd binding, so we
 can bind only to rctrl

---
 config/skhd/skhdrc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/skhd/skhdrc b/config/skhd/skhdrc
index 6e88c82..870a886 100644
--- a/config/skhd/skhdrc
+++ b/config/skhd/skhdrc
@@ -151,3 +151,5 @@ rctrl - d : yabai -m space --layout float
 play   : mpc toggle
 rewind : mpc cdprev
 fast   : mpc next
+
+rctrl - b : /usr/local/bin/hs -c 'stackline.config:toggle("appearance.showIcons")'

From 9da16428dd8958cb4aeb47f1eeed159990c4074f Mon Sep 17 00:00:00 2001
From: Danielle McLean <dani@00dani.me>
Date: Thu, 10 Dec 2020 21:29:56 +1100
Subject: [PATCH 3/4] feat: switch from BitBar (no longer actively developed)
 to SwiftBar

---
 config/swiftbar/bin/.gitignore                      |   1 +
 config/{bitbar => swiftbar}/bin/mpd-control.1h.zsh  |   0
 .../bin/taskpaper-ecoach.10s.py                     |   0
 .../bin/taskpaper-personal.10s.py                   |   0
 config/{bitbar => swiftbar}/bin/yabai.1s.zsh        |   0
 .../{bitbar => swiftbar}/lib/taskpaper/__init__.py  |   0
 .../{bitbar => swiftbar}/lib/taskpaper/default.png  | Bin
 .../{bitbar => swiftbar}/lib/taskpaper/ecoach.png   | Bin
 8 files changed, 1 insertion(+)
 create mode 100644 config/swiftbar/bin/.gitignore
 rename config/{bitbar => swiftbar}/bin/mpd-control.1h.zsh (100%)
 rename config/{bitbar => swiftbar}/bin/taskpaper-ecoach.10s.py (100%)
 rename config/{bitbar => swiftbar}/bin/taskpaper-personal.10s.py (100%)
 rename config/{bitbar => swiftbar}/bin/yabai.1s.zsh (100%)
 rename config/{bitbar => swiftbar}/lib/taskpaper/__init__.py (100%)
 rename config/{bitbar => swiftbar}/lib/taskpaper/default.png (100%)
 rename config/{bitbar => swiftbar}/lib/taskpaper/ecoach.png (100%)

diff --git a/config/swiftbar/bin/.gitignore b/config/swiftbar/bin/.gitignore
new file mode 100644
index 0000000..eaf4ab0
--- /dev/null
+++ b/config/swiftbar/bin/.gitignore
@@ -0,0 +1 @@
+.repository.json
diff --git a/config/bitbar/bin/mpd-control.1h.zsh b/config/swiftbar/bin/mpd-control.1h.zsh
similarity index 100%
rename from config/bitbar/bin/mpd-control.1h.zsh
rename to config/swiftbar/bin/mpd-control.1h.zsh
diff --git a/config/bitbar/bin/taskpaper-ecoach.10s.py b/config/swiftbar/bin/taskpaper-ecoach.10s.py
similarity index 100%
rename from config/bitbar/bin/taskpaper-ecoach.10s.py
rename to config/swiftbar/bin/taskpaper-ecoach.10s.py
diff --git a/config/bitbar/bin/taskpaper-personal.10s.py b/config/swiftbar/bin/taskpaper-personal.10s.py
similarity index 100%
rename from config/bitbar/bin/taskpaper-personal.10s.py
rename to config/swiftbar/bin/taskpaper-personal.10s.py
diff --git a/config/bitbar/bin/yabai.1s.zsh b/config/swiftbar/bin/yabai.1s.zsh
similarity index 100%
rename from config/bitbar/bin/yabai.1s.zsh
rename to config/swiftbar/bin/yabai.1s.zsh
diff --git a/config/bitbar/lib/taskpaper/__init__.py b/config/swiftbar/lib/taskpaper/__init__.py
similarity index 100%
rename from config/bitbar/lib/taskpaper/__init__.py
rename to config/swiftbar/lib/taskpaper/__init__.py
diff --git a/config/bitbar/lib/taskpaper/default.png b/config/swiftbar/lib/taskpaper/default.png
similarity index 100%
rename from config/bitbar/lib/taskpaper/default.png
rename to config/swiftbar/lib/taskpaper/default.png
diff --git a/config/bitbar/lib/taskpaper/ecoach.png b/config/swiftbar/lib/taskpaper/ecoach.png
similarity index 100%
rename from config/bitbar/lib/taskpaper/ecoach.png
rename to config/swiftbar/lib/taskpaper/ecoach.png

From 15b889225d9d9d218cf4b86b813a88b86e271a94 Mon Sep 17 00:00:00 2001
From: Danielle McLean <dani@00dani.me>
Date: Thu, 10 Dec 2020 21:30:50 +1100
Subject: [PATCH 4/4] fix: update mpd-notify-bitbar to work with SwiftBar

---
 local/bin/mpd-notify-bitbar | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/local/bin/mpd-notify-bitbar b/local/bin/mpd-notify-bitbar
index 96212ff..976577e 100755
--- a/local/bin/mpd-notify-bitbar
+++ b/local/bin/mpd-notify-bitbar
@@ -1,4 +1,4 @@
 #!/bin/bash
 while mpc idle; do
-	open -g bitbar://refreshPlugin?name=mpd*
+	open swiftbar://refreshplugin?name=mpd-control
 done