daniel/dotfiles
1
0
Fork 0
Code Activity Actions

Compare commits

base: daniel:527dd0d0aef0a705a4e3e89e062145bdcafb917e
Branches Tags
daniel:master
...
compare: daniel:6c9639f8ced26b2a74a75f77ac379ac7887a3f4c
Branches Tags
daniel:master

3 commits
527dd0d0ae ... 6c9639f8ce

Author SHA1 Message Date
Daniel Kempkens
6c9639f8ce
yabai: upgrade yabai configuration 2024-03-12 18:26:17 +01:00
Daniel Kempkens
ef1c8684c3
styx: update configuration 2024-03-12 09:14:44 +01:00
Daniel Kempkens
69f248c891
yabai: add keycombo for split 2024-03-12 09:14:44 +01:00
3 changed files with 93 additions and 20 deletions
Show stats Expand all files Collapse all files

37
system/darwin/mas.nix Normal file
View file

@ -0,0 +1,37 @@
{ pkgs, lib, ... }:
let
mas = pkgs.mas;
in
{
environment.systemPackages = [ mas ];
system.activationScripts.postUserActivation.text =
let
applications = [
"870330316" /* Clear Clipboard */
"1354318707" /* Core Tunnel */
"1055511498" /* Day One */
"640199958" /* Developer */
"1355679052" /* Dropover */
"1547121417" /* HomeControl */
"470158793" /* Keka */
"1567970985" /* MacFamilyTree 10 */
"1621800675" /* Mercury */
"1659154653" /* Mona */
"1094255754" /* Outbank */
"639968404" /* Parcel */
"1554235898" /* Peek */
"1289583905" /* Pixelmator Pro */
"1444636541" /* Photomator */
"1615798039" /* ReadKit */
"1663047912" /* Screens 5 */
"1475387142" /* Tailscale */
"1538878817" /* UTM */
];
in
''
echo "setting up App Store applications..."
${mas}/bin/mas install ${lib.concatStringsSep " " applications}
'';
}

74
system/darwin/yabai.nix
View file

@ -5,6 +5,17 @@ let
yabai-bin = "${yabai-pkg}/bin/yabai";
jq-bin = "${pkgs.jq}/bin/jq";
window_padding = 5;
native-tab-apps = [ "Finder" "TablePlus" ];
unmanaged-apps = [
"Dash"
"Dato"
"Mona"
"System.*einstellungen"
];
script-cycle-clockwise = pkgs.writeShellScript "yabai-cycle-clockwise.sh" ''
win=$(${yabai-bin} -m query --windows --window last | ${jq-bin} '.id')
@ -16,10 +27,30 @@ let
done
'';
native-tab-apps = [ "Finder" ];
native-tab-action = ''
(yabai -m display --focus next && yabai -m display --focus prev) || \
(yabai -m display --focus prev && yabai -m display --focus next)
script-smart-padding = pkgs.writeShellScript "yabai-smart-padding.sh" ''
space_index=$(${yabai-bin} -m query --spaces --window $YABAI_WINDOW_ID | ${jq-bin} '.[].index')
[ -z "$space_index" ] && space_index="mouse"
count=$(${yabai-bin} -m query --windows --space $space_index | ${jq-bin} 'map(select((."is-visible") and (."is-floating" | not))) | length')
padding=${toString window_padding}
[ $count -eq 1 ] && padding=0
${yabai-bin} -m config --space $space_index top_padding $padding
${yabai-bin} -m config --space $space_index bottom_padding $padding
${yabai-bin} -m config --space $space_index left_padding $padding
${yabai-bin} -m config --space $space_index right_padding $padding
${yabai-bin} -m config --space $space_index window_gap $padding
'';
script-native-tab-fix = pkgs.writeShellScript "yabai-native-tab-fix.sh" ''
app_display=$(${yabai-bin} -m query --windows --window $YABAI_WINDOW_ID | ${jq-bin} '.display')
[ -z "$app_display" ] && app_display=$(${yabai-bin} -m query --displays --display mouse | ${jq-bin} '.index')
if [ $app_display -eq 1 ]; then
${yabai-bin} -m display --focus next && yabai -m display --focus prev
else
${yabai-bin} -m display --focus prev && yabai -m display --focus next
fi
'';
in
{
@ -30,33 +61,34 @@ in
config = {
layout = "bsp";
top_padding = 5;
bottom_padding = 5;
left_padding = 5;
right_padding = 5;
window_gap = 5;
top_padding = window_padding;
bottom_padding = window_padding;
left_padding = window_padding;
right_padding = window_padding;
window_gap = window_padding;
window_placement = "second_child";
split_type = "auto";
};
extraConfig = ''
yabai -m rule --add app='^Dato$' manage=off
yabai -m rule --add app='^Dash$' manage=off
yabai -m rule --add app='^Mona$' manage=off
yabai -m rule --add app='^System.*einstellungen$' manage=off
extraConfig = (lib.strings.concatMapStrings (app: "yabai -m rule --add app='^${app}$' manage=off\n") unmanaged-apps) + ''
# Auto-float certain windows
yabai -m signal --add event=window_created action='
yabai -m query --windows --window $YABAI_WINDOW_ID | ${jq-bin} -er ".\"can-resize\" or .\"is-floating\"" || \
yabai -m window $YABAI_WINDOW_ID --toggle float
'
# Smart Gaps
yabai -m signal --add event=window_created action='${script-smart-padding}'
yabai -m signal --add event=window_destroyed action='${script-smart-padding}'
'' + lib.strings.concatMapStrings
# Hacky workaround for https://github.com/koekeishiya/yabai/issues/68
(app: ''
yabai -m signal --add event=window_created app="^${app}$" action='${native-tab-action}'
yabai -m signal --add event=window_destroyed app="^${app}$" action='${native-tab-action}'
yabai -m signal --add event=window_moved app="^${app}$" action='${native-tab-action}'
yabai -m signal --add event=window_resized app="^${app}$" action='${native-tab-action}'
# Native tab handling for ${app}
yabai -m signal --add event=window_created app="^${app}$" action='${script-native-tab-fix}'
yabai -m signal --add event=window_destroyed app="^${app}$" action='${script-native-tab-fix}'
yabai -m signal --add event=window_moved app="^${app}$" action='${script-native-tab-fix}'
yabai -m signal --add event=window_resized app="^${app}$" action='${script-native-tab-fix}'
'')
native-tab-apps;
};
@ -70,6 +102,8 @@ in
alt + shift - w : ${yabai-bin} -m display --focus west
alt + shift - e : ${yabai-bin} -m display --focus east
alt + shift - s : ${yabai-bin} -m window --toggle split
meh - h : ${yabai-bin} -m window --warp west
meh - j : ${yabai-bin} -m window --warp south
meh - k : ${yabai-bin} -m window --warp north
@ -91,7 +125,7 @@ in
meh - g : ${yabai-bin} -m window --resize bottom:0:40
meh - s : ${yabai-bin} -m window --resize bottom:0:-40
meh - b : ${yabai-bin} -m space --balance
meh - b : ${yabai-bin} -m space --balance && ${script-smart-padding}
hyper - h : ${yabai-bin} -m window --swap west
hyper - j : ${yabai-bin} -m window --swap south

2
system/hosts/Styx.nix
View file

@ -14,6 +14,8 @@ in
../darwin/fish.nix
../darwin/attic.nix
../darwin/mas.nix
../darwin/skhd.nix
../darwin/yabai.nix
];