fix skhd helpers, skhd is non-interactive, use .zshenv

Author: davay

.config/skhd/skhdrc

@@ -1,8 +1,8 @@
 # focus window
-alt - h : if [ "$($SKHD_DIR/helpers.sh get_layout)" = "stack" ]; then (yabai -m window --focus stack.prev || yabai -m window --focus stack.last); else yabai -m window --focus west; fi
+alt - h : if [ "$(get_layout)" = "stack" ]; then (yabai -m window --focus stack.prev || yabai -m window --focus stack.last); else yabai -m window --focus west; fi
 alt - j : yabai -m window --focus south
 alt - k : yabai -m window --focus north
-alt - l : if [ "$($SKHD_DIR/helpers.sh get_layout)" = "stack" ]; then (yabai -m window --focus stack.next || yabai -m window --focus stack.first); else yabai -m window --focus east; fi
+alt - l : if [ "$(get_layout)" = "stack" ]; then (yabai -m window --focus stack.next || yabai -m window --focus stack.first); else yabai -m window --focus east; fi
 
 # move window
 alt + shift - h : yabai -m window --warp west
@@ -36,8 +36,8 @@ alt + shift - 7 : yabai -m window --space 7 && yabai -m space --focus 7
 alt + shift - 8 : yabai -m window --space 8 && yabai -m space --focus 8 
 alt + shift - z : yabai -m window --display next && yabai -m display --focus next
 alt + shift - c : yabai -m window --display prev && yabai -m display --focus prev
-alt + shift - q : if [[ "$($SKHD_DIR/helpers.sh is_first_space)" == "false" ]]; then yabai -m window --space prev && yabai -m space --focus prev && yabai -m window --focus last; fi
-alt + shift - e : if [[ "$($SKHD_DIR/helpers.sh is_last_space)" == "false" ]]; then yabai -m window --space next && yabai -m space --focus next && yabai -m window --focus last; fi
+alt + shift - q : if [[ "$(is_first_space)" == "false" ]]; then yabai -m window --space prev && yabai -m space --focus prev && yabai -m window --focus last; fi
+alt + shift - e : if [[ "$(is_last_space)" == "false" ]]; then yabai -m window --space next && yabai -m space --focus next && yabai -m window --focus last; fi
 
 # fast focus monitor
 alt - z : yabai -m display --focus next
@@ -46,14 +46,14 @@ alt - c : yabai -m display --focus prev
 # move to prev or next space
 # order is swapped because my 2nd monitor is to the left of first monitor (right-to-left), while space goes left-to-right
 alt - tab : yabai -m display --focus recent
-alt - q : if [[ "$($SKHD_DIR/helpers.sh is_first_space)" == "false" ]]; then yabai -m space --focus prev; fi
-alt - e: if [[ "$($SKHD_DIR/helpers.sh is_last_space)" == "false" ]]; then yabai -m space --focus next; fi
+alt - q : if [[ "$(is_first_space)" == "false" ]]; then yabai -m space --focus prev; fi
+alt - e: if [[ "$(is_last_space)" == "false" ]]; then yabai -m space --focus next; fi
 
 # toggle (tiling) window fullscreen zoom
-# alt - f : yabai -m window --toggle zoom-fullscreen
+alt - f : yabai -m window --toggle zoom-fullscreen
 
 # toggle window native fullscreen
-alt - f : yabai -m window --toggle native-fullscreen
+alt + shift - f : yabai -m window --toggle native-fullscreen
 
 # toggle window split type
 alt - x : yabai -m window --toggle split

.config/skhd/helpers.sh .zshenv

@@ -1,7 +1,6 @@
-#!/bin/bash 
-
-# helpers for skhd
-# alternatively yabairc is a bash file, so i can just pair each function with an event and have skhd sent the event
+# sourced on all invocations of shell, even non-interactive ones
+# using this for SKHD
+# .zshrc is only sourced in interactive shells, so it didn't work
 
 get_last_space() {
   yabai -m query --displays --display | jq '.spaces[-1]' 
@@ -18,6 +17,3 @@ is_last_space() {
 get_layout() {
   yabai -m query --spaces --space | jq -r '.type'
 }
-
-# call the function passed as arg 
-"$@"

.zshrc

@@ -108,4 +108,3 @@ conda activate py311
 export PATH="$PATH:/Users/davay/.local/bin"
 export PATH="/opt/homebrew/opt/ruby/bin:$PATH"
 export PATH="$(gem environment gemdir)/bin:$PATH"
-export SKHD_DIR="$HOME/.config/skhd"