diff --git a/.config/skhd/skhdrc b/.config/skhd/skhdrc
new file mode 100755
index 0000000..a9d58a9
--- /dev/null
+++ b/.config/skhd/skhdrc
@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+#
+# I have set the "FN" key on my Planck to the "Meh" action which just fires
+# the Ctrl+Shift+Alt key combo which helps here to have unique skhd shortcuts
+# that don't clash with macOS/Neovim/...
+
+# Focus a window
+alt - h : yabai -m window --focus west
+alt - j : yabai -m window --focus south
+alt - k : yabai -m window --focus north
+alt - l : yabai -m window --focus east
+
+# Zoom a window
+ctrl + shift + alt - f : yabai -m window --toggle zoom-fullscreen
+
+# Move window and split (current desktop)
+#ctrl + shift + alt - h : yabai -m window --warp west
+#ctrl + shift + alt - j : yabai -m window --warp south
+#ctrl + shift + alt - k : yabai -m window --warp north
+#ctrl + shift + alt - l : yabai -m window --warp east
+
+# Swap windows
+ctrl + shift + alt - h : yabai -m window --swap west
+ctrl + shift + alt - j : yabai -m window --swap south
+ctrl + shift + alt - k : yabai -m window --swap north
+ctrl + shift + alt - l : yabai -m window --swap east
+
+# Move window to other desktop and focus desktop
+ctrl + shift + alt - 1 : yabai -m window --space 1; yabai -m space --focus 1
+ctrl + shift + alt - 2 : yabai -m window --space 2; yabai -m space --focus 2
+ctrl + shift + alt - 3 : yabai -m window --space 3; yabai -m space --focus 3
+ctrl + shift + alt - 4 : yabai -m window --space 4; yabai -m space --focus 4
+ctrl + shift + alt - 4 : yabai -m window --space 4; yabai -m space --focus 5
+
+# Move window to display left and right
+ctrl + shift + alt - r : yabai -m window --display west; yabai -m display --focus west;
+ctrl + shift + alt - u : yabai -m window --display east; yabai -m display --focus east;
+
diff --git a/.config/yabai/yabairc b/.config/yabai/yabairc
new file mode 100755
index 0000000..751676c
--- /dev/null
+++ b/.config/yabai/yabairc
@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+#
+# Logs:
+# /tmp/yabai_$USER.err.log
+# /tmp/yabai_$USER.out.log
+#
+# Border:
+# https://github.com/FelixKratz/JankyBorders
+
+yabai -m config layout bsp
+
+# Global
+yabai -m config focus_follows_mouse          off
+yabai -m config mouse_follows_focus          off
+
+yabai -m config layout                       bsp
+yabai -m config top_padding                  10
+yabai -m config bottom_padding               10
+yabai -m config left_padding                 10
+yabai -m config right_padding                10
+yabai -m config window_gap                   10
+
+yabai -m config mouse_action1                move
+yabai -m config mouse_action2                resize
+yabai -m config mouse_modifier               ctrl
+
+# Override gaps for space 2 only
+#yabai -m config --space 2 window_gap 
+
+# Floating (unmanaged) apps
+yabai -m rule --add app=Finder manage=off
+yabai -m rule --add app=Calculator manage=off
+
+# Launch borders
+borders active_color=0xffFF2400 inactive_color=0xff494d64 width=4.0 style=round blur_radius=7.4 &
+
+echo "$(date) yabai config $0 loaded"