From fcfe1ffa27b2d8f2cd5549b6b235c5e1be7fe3a9 Mon Sep 17 00:00:00 2001
From: Ambrose Chua <ambrose@chua.family>
Date: Sun, 29 Sep 2019 21:45:39 +0800
Subject: [PATCH] Improve colours and match bindings

---
 .config/skhd/skhdrc   | 42 ++++++++++++++++++++++++++++++++++--------
 .config/sway/config   |  4 ++--
 .config/yabai/yabairc | 10 +++++++---
 3 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/.config/skhd/skhdrc b/.config/skhd/skhdrc
index d4090a5..d81ee6f 100644
--- a/.config/skhd/skhdrc
+++ b/.config/skhd/skhdrc
@@ -22,10 +22,10 @@ alt - d : skhd -k "cmd - space"
 #osascript -e 'tell application "System Events" to keystroke space using {command down}'
 
 # reload skhd configuration file
-alt + shift - c : skhd reload
+#alt + shift - c : skhd reload
 
 # reload chunkwm
-alt + shift - e : ~/.yabairc
+#alt + shift - e : ~/.yabairc
 
 #
 # Moving around:
@@ -85,13 +85,15 @@ alt + shift - 0x1D : yabai -m window --space 10
 #
 
 # switch to displays
-alt - a : yabai -m display --focus 1
-alt - b : yabai -m display --focus 2
-alt - c : yabai -m display --focus 3
+alt - 0x2A : yabai -m display --focus 1
+alt - 0x1E : yabai -m display --focus 2
+alt - 0x21 : yabai -m display --focus 3
+alt - 0x18 : yabai -m display --focus 3
 # move to display and follow
-alt + shift - a : yabai -m window --display 1; yabai -m display --focus 1
-alt + shift - b : yabai -m window --display 2; yabai -m display --focus 2
-alt + shift - c : yabai -m window --display 3; yabai -m display --focus 3
+alt + shift - 0x2A : yabai -m window --display 1; yabai -m display --focus 1
+alt + shift - 0x1E : yabai -m window --display 2; yabai -m display --focus 2
+alt + shift - 0x21 : yabai -m window --display 3; yabai -m display --focus 3
+alt + shift - 0x18 : yabai -m window --display 4; yabai -m display --focus 4
 
 #
 # Layout stuff:
@@ -107,16 +109,34 @@ alt + ctrl - j : yabai -m window --insert south
 alt + ctrl - k : yabai -m window --insert north
 alt + ctrl - l : yabai -m window --insert east
 
+# Switch the current container between different layout styles
+# alt - s : 
+# alt - w :
+# Below, we approximate the feature of Sway
+alt - e : yabai -m space --rotate 90
+
 # Make the current focus fullscreen
 alt - f : yabai -m window --toggle zoom-fullscreen
 
 # Toggle the current focus between tiling and floating mode
 alt + shift - space : yabai -m window --toggle float; yabai -m window --grid 4:4:1:1:2:2
 
+# Swap focus between the tiling area and the floating area
+# alt - space
+
 #
 # Scratchpad:
 #
 
+# Sway has a "scratchpad", which is a bag of holding for windows.
+# You can send windows there and get them back later.
+
+# Move the currently focused window to the scratchpad
+# alt + shift - - : 
+
+# Show the next scratchpad window or hide the focused scratchpad window.
+# If there are multiple scratchpad windows, this command cycles through them.
+# alt - - : 
 
 #
 # Resizing containers:
@@ -142,3 +162,9 @@ resize < right : yabai -m window --resize left:12:0; yabai -m window --resize ri
 
 alt - g : yabai -m space --gap abs:36; yabai -m space --padding abs:60:60:60:60
 alt + shift - g : yabai -m space --gap abs:12; yabai -m space --padding abs:20:20:20:20
+
+#
+# Custom shadows
+#
+
+alt - s : yabai -m window --toggle shadow
diff --git a/.config/sway/config b/.config/sway/config
index 425e569..c391d54 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -69,7 +69,7 @@ input * {
     floating_modifier $mod normal
 
     # reload the configuration file
-    bindsym $mod+Shift+c reload
+    #bindsym $mod+Shift+c reload
 
     # exit sway (logs you out of your wayland session)
     bindsym $mod+Shift+e exit
@@ -152,7 +152,7 @@ input * {
     bindsym $mod+space focus mode_toggle
 
     # move focus to the parent container
-    bindsym $mod+a focus parent
+    #bindsym $mod+a focus parent
 #
 # Scratchpad:
 #
diff --git a/.config/yabai/yabairc b/.config/yabai/yabairc
index 71d2c6b..7a91af0 100755
--- a/.config/yabai/yabairc
+++ b/.config/yabai/yabairc
@@ -30,14 +30,14 @@ yabai -m config window_border_width          2
 
 yabai -m config active_window_border_color   0xbbcb4b16
 yabai -m config normal_window_border_color   0x00cb4b16
-yabai -m config insert_window_border_color   0xbbb58900
+yabai -m config insert_window_border_color   0xff268bd2
 
 yabai -m config window_opacity               off
 yabai -m config active_window_opacity        1.0
 yabai -m config normal_window_opacity        0.90
 yabai -m config window_opacity_duration      0.0
 
-yabai -m config window_shadow                off
+yabai -m config window_shadow                on
 
 #
 # Desktop
@@ -67,12 +67,16 @@ yabai -m rule --add app=Safari space=3
 yabai -m rule --add app=Chrome space=3
 yabai -m rule --add app=Firefox space=3
 yabai -m rule --add app=Brave space=3
-yabai -m rule --add app=iTerm space=4
+yabai -m rule --add app=iTerm space=^4
 yabai -m rule --add app=Discord space=5
 yabai -m rule --add app=Telegram space=5
 yabai -m rule --add app=Slack space=5
 yabai -m rule --add app=Signal space=5
 yabai -m rule --add app=Skype space=5
 yabai -m rule --add app=Steam space=6
+#
+# Space rules
+#
+yabai -m space 6 --layout float
 
 echo "yabai configuration loaded.."