reo101/rix101
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(darwin): update modules

Browse source 
Don't regenerate yabai workspaces
Add more `nix-darwin` options
Add `pinentry-touchid` and `xquartz`
This commit is contained in:
reo101 2023-07-13 14:29:17 +03:00
parent 319817b5c0
commit ae6e5af098
Signed by: reo101
GPG key ID: 675AA7EF13964ACB
3 changed files with 76 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

54
modules/nix-darwin/yabai/yabairc
View file

@ -13,33 +13,33 @@ yabai -m signal --add event=window_destroyed action="sketchybar --trigger window
yabai -m signal --add event=window_destroyed action="yabai -m query --windows --window &> /dev/null || yabai -m window --focus mouse"
yabai -m signal --add event=application_terminated action="yabai -m query --windows --window &> /dev/null || yabai -m window --focus mouse"
{
DESIRED_SPACES_PER_DISPLAY=4
CURRENT_SPACES="$(yabai -m query --displays | jq -r '.[].spaces | @sh')"
DELTA=0
while read -r line
do
LAST_SPACE="$(echo "${line##* }")"
LAST_SPACE=$((${LAST_SPACE}+${DELTA}))
EXISTING_SPACE_COUNT="$(echo "${line}" | wc -w)"
MISSING_SPACES=$((${DESIRED_SPACES_PER_DISPLAY} - ${EXISTING_SPACE_COUNT}))
if [ "${MISSING_SPACES}" -gt 0 ]; then
for i in $(seq 1 ${MISSING_SPACES}); do
yabai -m space --create "${LAST_SPACE}"
LAST_SPACE=$((${LAST_SPACE}+1))
done
elif [ "${MISSING_SPACES}" -lt 0 ]; then
for i in $(seq 1 $((-${MISSING_SPACES}))); do
yabai -m space --destroy "${LAST_SPACE}"
LAST_SPACE=$((${LAST_SPACE}-1))
done
fi
DELTA=$((${DELTA}+${MISSING_SPACES}))
done <<< "${CURRENT_SPACES}"
sketchybar --trigger space_change --trigger windows_on_spaces
}
# {
# DESIRED_SPACES_PER_DISPLAY=4
# CURRENT_SPACES="$(yabai -m query --displays | jq -r '.[].spaces | @sh')"
#
# DELTA=0
# while read -r line
# do
# LAST_SPACE="$(echo "${line##* }")"
# LAST_SPACE=$((${LAST_SPACE}+${DELTA}))
# EXISTING_SPACE_COUNT="$(echo "${line}" | wc -w)"
# MISSING_SPACES=$((${DESIRED_SPACES_PER_DISPLAY} - ${EXISTING_SPACE_COUNT}))
# if [ "${MISSING_SPACES}" -gt 0 ]; then
# for i in $(seq 1 ${MISSING_SPACES}); do
# yabai -m space --create "${LAST_SPACE}"
# LAST_SPACE=$((${LAST_SPACE}+1))
# done
# elif [ "${MISSING_SPACES}" -lt 0 ]; then
# for i in $(seq 1 $((-${MISSING_SPACES}))); do
# yabai -m space --destroy "${LAST_SPACE}"
# LAST_SPACE=$((${LAST_SPACE}-1))
# done
# fi
# DELTA=$((${DELTA}+${MISSING_SPACES}))
# done <<< "${CURRENT_SPACES}"
#
# sketchybar --trigger space_change --trigger windows_on_spaces
# }
yabai -m config "external_bar" "all:49:0" \
"window_border" "on" \