From 840f804b8903a708fbf350b32fade36e7db711db Mon Sep 17 00:00:00 2001
From: Ray Andrew <rs@rs.ht>
Date: Mon, 7 Apr 2025 12:47:31 -0500
Subject: [PATCH] fix quirks on multi monitors

---
 darwin/aerospace.nix                         | 18 ++++++++++--------
 darwin/homebrew.nix                          |  6 ++++++
 darwin/sketchybar/config/items/aerospace.lua | 11 ++++++++++-
 hosts/dango/default.nix                      |  1 +
 4 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/darwin/aerospace.nix b/darwin/aerospace.nix
index 269b022..cecf9d9 100644
--- a/darwin/aerospace.nix
+++ b/darwin/aerospace.nix
@@ -36,11 +36,6 @@ in
         on-focused-monitor-changed = [ "move-mouse monitor-lazy-center" ];
         default-root-container-layout = "tiles";
         default-root-container-orientation = "auto";
-        # exec-on-workspace-change = [
-        #   "/bin/bash"
-        #   "-c"
-        #   "sketchybar --trigger aerospace_workspace_change FOCUSED=$AEROSPACE_FOCUSED_WORKSPACE"
-        # ];
 
         gaps = {
           inner = {
@@ -50,7 +45,11 @@ in
           outer = {
             left = 10;
             bottom = 5;
-            top = 12;
+            top = [
+              { monitor."LG ULTRAWIDE" = 50; }
+              { monitor."ZOWIE XL LCD" = 50; }
+              12
+            ];
             right = 10;
           };
         };
@@ -206,11 +205,14 @@ in
           "4" = "main";
           "5" = "main";
           "6" = "main";
-          "7" = "main";
+          "7" = [
+            "2"
+            "main"
+          ];
           "8" = "main";
           "9" = "main";
           "10" = [
-            "secondary"
+            "2"
             "main"
           ];
         };
diff --git a/darwin/homebrew.nix b/darwin/homebrew.nix
index 1949fe7..0e2cb8d 100644
--- a/darwin/homebrew.nix
+++ b/darwin/homebrew.nix
@@ -22,6 +22,7 @@
     vscode = mkEnableOption "Enable VSCode";
     firefox = mkEnableOption "Enable Firefox";
     chromium = mkEnableOption "Enable Chromium";
+    aldente = mkEnableOption "Enable AlDente";
   };
 
   config = lib.mkMerge [
@@ -113,5 +114,10 @@
         "chromium"
       ];
     })
+    (lib.mkIf config.custom.brew.aldente {
+      homebrew.casks = [
+        "aldente"
+      ];
+    })
   ];
 }
diff --git a/darwin/sketchybar/config/items/aerospace.lua b/darwin/sketchybar/config/items/aerospace.lua
index 0dd98f0..edf2a98 100644
--- a/darwin/sketchybar/config/items/aerospace.lua
+++ b/darwin/sketchybar/config/items/aerospace.lua
@@ -1,3 +1,5 @@
+-- https://github.com/Tnixc/nix-config/blob/main/home/programs/aerospace-sketchybar/sbar-config-libs/items/aerospaces.lua
+
 local Promise = require("promise")
 local colors = require("colors")
 local utils = require("utils")
@@ -27,6 +29,13 @@ local function getAllWindows()
 end
 
 local function getMonitorId(obj)
+   if obj["monitor-name"] then
+		if obj["monitor-name"] == "ZOWIE XL LCD" then
+			return "2"
+		elseif obj["monitor-name"] == "LG ULTRAWIDE" then
+			return "1"
+		end
+	end
    if obj["monitor-appkit-nsscreen-screens-id"] then
       return obj["monitor-appkit-nsscreen-screens-id"]
    end
@@ -91,7 +100,7 @@ function getState()
 			else
 				workspacestate["appicons"] = ""
 			end
-            -- print(utils.dump(workspacestate))
+            print(utils.dump(workspacestate))
 		end
 
          return newstate
diff --git a/hosts/dango/default.nix b/hosts/dango/default.nix
index d271c3f..4794300 100644
--- a/hosts/dango/default.nix
+++ b/hosts/dango/default.nix
@@ -40,6 +40,7 @@
       vscode = true;
       firefox = true;
       chromium = true;
+      aldente = true;
     };
   };