Author: Kyle Fuller <kyle@fuller.li> 2018-08-01 23:53:35 +0100 +0100
Committer: Kyle Fuller <kyle@fuller.li> 2018-08-01 23:53:35 +0100 +0100
Commit: 896c263fe942ddc680cfb559e99e775d811ba16c
Parent: f25ae8c8951bd8ebf78aa361b237aa3d3b84342a
refactor(skhd): Focus with hyper, move with meh
diff --git a/.skhdrc b/.skhdrc
index 936d65e825c4c2db5374eef576bac1fface12453..20bff487750c8beeb9afb05d4fb37c15c7d1fa4a 100644
--- a/.skhdrc
+++ b/.skhdrc
@@ -5,11 +5,11 @@ hyper - return : osascript -e 'tell application "iTerm2" to make create window with default profile'
# Current Window (hyper)
-# swap window
-hyper - left : chunkc tiling::window --swap west
-hyper - down : chunkc tiling::window --swap south
-hyper - up : chunkc tiling::window --swap north
-hyper - right : chunkc tiling::window --swap east
+# focus window
+hyper - left : chunkc tiling::window --focus west
+hyper - down : chunkc tiling::window --focus south
+hyper - up : chunkc tiling::window --focus north
+hyper - right : chunkc tiling::window --focus east
# toggle window fullscreen
hyper - f : chunkc tiling::window --toggle fullscreen
@@ -17,17 +17,17 @@
# float / unfloat window (detach)
hyper - d : chunkc tiling::window --toggle float
-# send window to desktop
-hyper - 1 : chunkc tiling::window --send-to-desktop 1
-hyper - 2 : chunkc tiling::window --send-to-desktop 2
-hyper - 3 : chunkc tiling::window --send-to-desktop 3
-hyper - 4 : chunkc tiling::window --send-to-desktop 4
-hyper - 5 : chunkc tiling::window --send-to-desktop 5
+# focus desktop
+hyper - 1 : chunkc tiling::desktop --focus 1
+hyper - 2 : chunkc tiling::desktop --focus 2
+hyper - 3 : chunkc tiling::desktop --focus 3
+hyper - 4 : chunkc tiling::desktop --focus 4
+hyper - 5 : chunkc tiling::desktop --focus 5
-# send window to monitor and follow focus
-hyper - 6 : chunkc tiling::window --send-to-monitor 1; chunkc tiling::monitor -f 1
-hyper - 7 : chunkc tiling::window --send-to-monitor 2; chunkc tiling::monitor -f 2
-hyper - 8 : chunkc tiling::window --send-to-monitor 3; chunkc tiling::monitor -f 3
+# focus monitor
+hyper - 6 : chunkc tiling::monitor -f 1
+hyper - 7 : chunkc tiling::monitor -f 2
+hyper - 8 : chunkc tiling::monitor -f 3
# Resize mode
:: resize @ : chunkc border::color 0xff24ccaa
@@ -51,11 +51,11 @@ resize < shift - right : chunkc tiling:window --use-temporary-ratio -0.1 --adjust-window-edge west
# Current Desktop (meh)
-# focus window
-meh - left : chunkc tiling::window --focus west
-meh - down : chunkc tiling::window --focus south
-meh - up : chunkc tiling::window --focus north
-meh - right : chunkc tiling::window --focus east
+# swap window
+meh - left : chunkc tiling::window --swap west
+meh - down : chunkc tiling::window --swap south
+meh - up : chunkc tiling::window --swap north
+meh - right : chunkc tiling::window --swap east
# rotate tree
meh - r : chunkc tiling::desktop --rotate 90
@@ -83,17 +83,17 @@ meh - b : chunkc tiling::desktop --layout bsp
meh - m : chunkc tiling::desktop --layout monocle
meh - d : chunkc tiling::desktop --layout float
-# move to desktop
-meh - 1 : chunkc tiling::desktop --focus 1
-meh - 2 : chunkc tiling::desktop --focus 2
-meh - 3 : chunkc tiling::desktop --focus 3
-meh - 4 : chunkc tiling::desktop --focus 4
-meh - 5 : chunkc tiling::desktop --focus 5
+# send window to desktop
+meh - 1 : chunkc tiling::window --send-to-desktop 1
+meh - 2 : chunkc tiling::window --send-to-desktop 2
+meh - 3 : chunkc tiling::window --send-to-desktop 3
+meh - 4 : chunkc tiling::window --send-to-desktop 4
+meh - 5 : chunkc tiling::window --send-to-desktop 5
-# focus monitor
-meh - 6 : chunkc tiling::monitor -f 1
-meh - 7 : chunkc tiling::monitor -f 2
-meh - 8 : chunkc tiling::monitor -f 3
+# send window to monitor and follow focus
+meh - 6 : chunkc tiling::window --send-to-monitor 1; chunkc tiling::monitor -f 1
+meh - 7 : chunkc tiling::window --send-to-monitor 2; chunkc tiling::monitor -f 2
+meh - 8 : chunkc tiling::window --send-to-monitor 3; chunkc tiling::monitor -f 3
# set insertion point for focused container
ctrl + alt - f : chunkc tiling::window --use-insertion-point cancel
diff --git a/README.md b/README.md
index a3ab3daf88b22b6a480dbc30cd469b647aa2f9fe..2528748ac03b772d2fa2c4949efea4d9a5f51078 100644
--- a/README.md
+++ b/README.md
@@ -37,18 +37,18 @@ |---------------|-----------------------|
| hyper - f | Toggle fullscreen |
| hyper - d | Toggle Float |
| hyper - r | Enter resize mode |
-| hyper - up | Swap up window |
-| hyper - right | Swap right window |
-| hyper - down | Swap down window |
-| hyper - left | Swap left window |
-| hyper - 1 | Send to Desktop 1 |
-| hyper - 2 | Send to Desktop 2 |
-| hyper - 3 | Send to Desktop 3 |
-| hyper - 4 | Send to Desktop 4 |
-| hyper - 5 | Send to Desktop 5 |
-| hyper - 6 | Send to Monitor 1 |
-| hyper - 7 | Send to Monitor 2 |
-| hyper - 8 | Send to Monitor 3 |
+| hyper - up | Focus up window |
+| hyper - right | Focus right window |
+| hyper - down | Focus down window |
+| hyper - left | Focus left window |
+| hyper - 1 | Focus Desktop 1 |
+| hyper - 2 | Focus Desktop 2 |
+| hyper - 3 | Focus Desktop 3 |
+| hyper - 4 | Focus Desktop 4 |
+| hyper - 5 | Focus Desktop 5 |
+| hyper - 6 | Focus Monitor 1 |
+| hyper - 7 | Focus Monitor 2 |
+| hyper - 8 | Focus Monitor 3 |
##### Resize Mode
@@ -77,17 +77,17 @@ | meh - g | Toggle Gaps |
| meh - b | BSP Mode |
| meh - m | Monocle Mode |
| meh - d | Floating Mode |
-| meh - s | Toggle split |
+| meh - s | Toggle split |
| meh - f | Toggle native fullscreen |
-| meh - up | Focus up window |
-| meh - right | Focus right window |
-| meh - down | Focus down window |
-| meh - left | Focus left window |
+| meh - up | Swap up window |
+| meh - right | Swap right window |
+| meh - down | Swap down window |
+| meh - left | Swap left window |
| meh - 1 | Move to Desktop 1 |
| meh - 2 | Move to Desktop 2 |
| meh - 3 | Move to Desktop 3 |
| meh - 4 | Move to Desktop 4 |
| meh - 5 | Move to Desktop 5 |
-| meh - 6 | Focus Monitor 1 |
-| meh - 7 | Focus Monitor 2 |
-| meh - 8 | Focus Monitor 3 |
+| meh - 6 | Move to Monitor 1 |
+| meh - 7 | Move to Monitor 2 |
+| meh - 8 | Move to Monitor 3 |