Merge branch 'master' of gitlab.com:rehashedsalt/home

This commit is contained in:
Salt 2020-04-15 08:37:59 -05:00
commit 4081e9fd66
2 changed files with 22 additions and 22 deletions

View File

@ -6,13 +6,6 @@ cmd - h : yabai -m window --focus west
cmd - j : yabai -m window --focus south cmd - j : yabai -m window --focus south
cmd - k : yabai -m window --focus north cmd - k : yabai -m window --focus north
cmd - l : yabai -m window --focus east 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 # Focus workspace
cmd - 1 : yabai -m space --focus 1 cmd - 1 : yabai -m space --focus 1
cmd - 2 : yabai -m space --focus 2 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 - 7 : yabai -m space --focus 7
cmd - 8 : yabai -m space --focus 8 cmd - 8 : yabai -m space --focus 8
# Move focus container to workspace # Moving windows
cmd + shift - 1 : yabai -m window --space 1 cmd + shift - h : yabai -m window --warp west
cmd + shift - 2 : yabai -m window --space 2 cmd + shift - j : yabai -m window --warp south
cmd + shift - 3 : yabai -m window --space 3 cmd + shift - k : yabai -m window --warp north
cmd + shift - 4 : yabai -m window --space 4 cmd + shift - l : yabai -m window --warp east
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
# Resize windows # Resize windows
lctrl + cmd - h : \ lctrl + cmd - h : \
yabai -m window --resize left:-20:0 ; \ yabai -m window --resize left:-20:0 ; \
@ -46,14 +34,21 @@ lctrl + cmd - k : \
lctrl + cmd - l : \ lctrl + cmd - l : \
yabai -m window --resize left:20:0 ; \ yabai -m window --resize left:20:0 ; \
yabai -m window --resize right: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 # Float window
lctrl - f : yabai -m window --toggle float lctrl - f : yabai -m window --toggle float
# Fullscreen window # Fullscreen window
alt + shift - f : yabai -m window --toggle zoom-fullscreen alt + shift - f : yabai -m window --toggle zoom-fullscreen
cmd + shift - f : yabai -m window --toggle native-fullscreen cmd + shift - f : yabai -m window --toggle native-fullscreen
# Balance space in workspace # Balance space in workspace
cmd + shift - 0 : yabai -m space --balance cmd + shift - 0 : yabai -m space --balance

View File

@ -6,12 +6,17 @@
# Distributed under terms of the MIT license. # 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 if ! pgrep -f "iTerm" > /dev/null 2>&1; then
echo "Opening iTerm" echo "Opening iTerm"
exec open -a "/Applications/iTerm.app" open -a "/Applications/iTerm.app"
elif ! osascript -e 'tell application "iTerm2" to create window with default profile' > /dev/null 2>&1; then fi
if osascript -e "$osascriptcmd" > /dev/null 2>&1; then
echo "Opening new iTerm window"
else
echo "Killing iTerm and restarting" echo "Killing iTerm and restarting"
killall "iTerm" killall "iTerm"
exec open -a "/Applications/iTerm.app" open -a "/Applications/iTerm.app"
osascript -e "$osascriptcmd"
fi fi