1
0
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2025-04-08 10:09:38 +00:00

Merge pull request from shardulbee/master

Separate yabai config and extra config by newline
This commit is contained in:
Daiderd Jordan 2020-05-25 20:03:31 +02:00 committed by GitHub
commit 600bd4f9ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
modules/services/yabai
tests

View file

@ -14,7 +14,7 @@ let
(if (cfg.config != {})
then "${toYabaiConfig cfg.config}"
else "")
+ optionalString (cfg.extraConfig != "") cfg.extraConfig)}";
+ optionalString (cfg.extraConfig != "") ("\n" + cfg.extraConfig + "\n"))}";
in
{

View file

@ -23,5 +23,6 @@ in
echo >&2 "checking config in $conf"
grep "yabai -m config focus_follows_mouse autoraise" $conf
grep "yabai -m rule --add app='System Preferences' manage=off" $conf
if [ `cat $conf | wc -l` -eq "2" ]; then echo "yabairc correctly contains 2 lines"; else return 1; fi
'';
}