From 69d99c998b318cbaa4b3c964dd26ed1809001bc0 Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Wed, 8 Apr 2020 01:23:10 -0500
Subject: [PATCH 1/2] Yabai: Change iTerm script to reflect its behavior With
 my config, it doesn't spawn a window on first launch

---
 .config/yabai/open-iterm2.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/.config/yabai/open-iterm2.sh b/.config/yabai/open-iterm2.sh
index 0ea1e260..3a6825e6 100755
--- a/.config/yabai/open-iterm2.sh
+++ b/.config/yabai/open-iterm2.sh
@@ -6,12 +6,17 @@
 # Distributed under terms of the MIT license.
 #
 
+osascriptcmd='tell application "iTerm2" to create window with default profile'
 if ! pgrep -f "iTerm" > /dev/null 2>&1; then
 	echo "Opening iTerm"
-	exec open -a "/Applications/iTerm.app"
-elif ! osascript -e 'tell application "iTerm2" to create window with default profile' > /dev/null 2>&1; then
+	open -a "/Applications/iTerm.app"
+fi
+if osascript -e "$osascriptcmd" > /dev/null 2>&1; then
+	echo "Opening new iTerm window"
+else
 	echo "Killing iTerm and restarting"
 	killall "iTerm"
-	exec open -a "/Applications/iTerm.app"
+	open -a "/Applications/iTerm.app"
+	osascript -e "$osascriptcmd"
 fi
 

From a4f8070b84c9daf1871dc6bd6be25fa2d2eba4ac Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Fri, 10 Apr 2020 06:48:46 -0500
Subject: [PATCH 2/2] skhd: Reorganize config

---
 .config/skhd/skhdrc | 33 ++++++++++++++-------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/.config/skhd/skhdrc b/.config/skhd/skhdrc
index 658dffad..c813947b 100644
--- a/.config/skhd/skhdrc
+++ b/.config/skhd/skhdrc
@@ -6,13 +6,6 @@ cmd - h : yabai -m window --focus west
 cmd - j : yabai -m window --focus south
 cmd - k : yabai -m window --focus north
 cmd - l : yabai -m window --focus east
-
-# Moving windows
-cmd + shift - h : yabai -m window --warp west
-cmd + shift - j : yabai -m window --warp south
-cmd + shift - k : yabai -m window --warp north
-cmd + shift - l : yabai -m window --warp east
-
 # Focus workspace
 cmd - 1 : yabai -m space --focus 1
 cmd - 2 : yabai -m space --focus 2
@@ -23,16 +16,11 @@ cmd - 6 : yabai -m space --focus 6
 cmd - 7 : yabai -m space --focus 7
 cmd - 8 : yabai -m space --focus 8
 
-# Move focus container to workspace
-cmd + shift - 1 : yabai -m window --space 1
-cmd + shift - 2 : yabai -m window --space 2
-cmd + shift - 3 : yabai -m window --space 3
-cmd + shift - 4 : yabai -m window --space 4
-cmd + shift - 5 : yabai -m window --space 5
-cmd + shift - 6 : yabai -m window --space 6
-cmd + shift - 7 : yabai -m window --space 7
-cmd + shift - 8 : yabai -m window --space 8
-
+# Moving windows
+cmd + shift - h : yabai -m window --warp west
+cmd + shift - j : yabai -m window --warp south
+cmd + shift - k : yabai -m window --warp north
+cmd + shift - l : yabai -m window --warp east
 # Resize windows
 lctrl + cmd - h : \
 	yabai -m window --resize left:-20:0 ; \
@@ -46,14 +34,21 @@ lctrl + cmd - k : \
 lctrl + cmd - l : \
 	yabai -m window --resize left:20:0 ; \
 	yabai -m window --resize right:20:0
+# Move focus container to workspace
+cmd + shift - 1 : yabai -m window --space 1
+cmd + shift - 2 : yabai -m window --space 2
+cmd + shift - 3 : yabai -m window --space 3
+cmd + shift - 4 : yabai -m window --space 4
+cmd + shift - 5 : yabai -m window --space 5
+cmd + shift - 6 : yabai -m window --space 6
+cmd + shift - 7 : yabai -m window --space 7
+cmd + shift - 8 : yabai -m window --space 8
 
 # Float window
 lctrl - f : yabai -m window --toggle float
-
 # Fullscreen window
 alt + shift - f : yabai -m window --toggle zoom-fullscreen
 cmd + shift - f : yabai -m window --toggle native-fullscreen
-
 # Balance space in workspace
 cmd + shift - 0 : yabai -m space --balance