From f80ea3290125d61a4bde2ce620c93734593f3886 Mon Sep 17 00:00:00 2001
From: Daniel Kempkens <daniel+git@kempkens.io>
Date: Tue, 4 Jun 2024 20:43:44 +0200
Subject: [PATCH] yabai: remove native tab hack

---
 system/darwin/jankyborders.nix |  2 +-
 system/darwin/yabai.nix        | 36 +---------------------------------
 2 files changed, 2 insertions(+), 36 deletions(-)

diff --git a/system/darwin/jankyborders.nix b/system/darwin/jankyborders.nix
index 85cf42f..d62c9e7 100644
--- a/system/darwin/jankyborders.nix
+++ b/system/darwin/jankyborders.nix
@@ -10,7 +10,7 @@ let
     "width=7.0"
     "hidpi=on"
     "ax_focus=on"
-    "blacklist=\"Dropover,LaunchBar\""
+    "blacklist='Dropover,LaunchBar'"
   ];
 in
 {
diff --git a/system/darwin/yabai.nix b/system/darwin/yabai.nix
index efff601..528b6dd 100644
--- a/system/darwin/yabai.nix
+++ b/system/darwin/yabai.nix
@@ -7,8 +7,6 @@ let
 
   window_padding = 10;
 
-  native-tab-apps = [ "Finder" "TablePlus" ];
-
   unmanaged-apps = [
     "Dash"
     "Dato"
@@ -43,29 +41,6 @@ let
     ${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')
-
-    ql_windows=$(${yabai-bin} -m query --windows --display $app_display | ${jq-bin} 'map(select(.subrole == "Quick Look")) | length')
-
-    if [ $app_display -eq 1 ]; then
-      win_count=$(${yabai-bin} -m query --windows --display next | ${jq-bin} 'length')
-      [ -z "$win_count" ] && win_count=0
-
-      if [ $ql_windows -eq 0 ] && [ $win_count -gt 0 ]; then
-        ${yabai-bin} -m display --focus next && yabai -m display --focus prev
-      fi
-    else
-      win_count=$(${yabai-bin} -m query --windows --display prev | ${jq-bin} 'length')
-      [ -z "$win_count" ] && win_count=0
-
-      if [ $ql_windows -eq 0 ] && [ $win_count -gt 0 ]; then
-        ${yabai-bin} -m display --focus prev && yabai -m display --focus next
-      fi
-    fi
-  '';
 in
 {
   services.yabai = {
@@ -98,16 +73,7 @@ in
       # 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: ''
-        # 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;
+    '';
   };
 
   services.skhd.skhdConfig = ''