From 2c65cf1138712f1b3d5b437a8b16399474b6815b Mon Sep 17 00:00:00 2001
From: rope <fredrik@nordhammer.it>
Date: Fri, 7 Aug 2026 14:36:46 +0100
Subject: [PATCH] macbook: drop mascots and mbpfan; SMC already ramps

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
---
 hosts/FredOS-Macbook.nix | 7 +++----
 settings/quickshell.nix  | 4 ++++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/hosts/FredOS-Macbook.nix b/hosts/FredOS-Macbook.nix
index 6e2a7e1..de069cc 100644
--- a/hosts/FredOS-Macbook.nix
+++ b/hosts/FredOS-Macbook.nix
@@ -30,10 +30,9 @@
     services.tlp.enable = false;
     services.power-profiles-daemon.enable = true;
 
-    # Linux leaves the Apple SMC fans at their minimum RPM — nothing in-tree
-    # ramps them. The CPU therefore sits at its thermal limit under any real
-    # load and throttles instead of spinning up. mbpfan drives applesmc.
-    services.mbpfan.enable = true;
+    # No mbpfan: measured 5813 of 6500 RPM at idle, so the SMC firmware is
+    # already ramping hard on its own. A more aggressive curve has nothing
+    # left to give — the cooling path itself is the limit.
 
     # Haswell's own thermal management: throttle gradually via RAPL/P-states
     # instead of waiting for the hardware's PROCHOT emergency brake.
diff --git a/settings/quickshell.nix b/settings/quickshell.nix
index 5dc629b..8408d46 100644
--- a/settings/quickshell.nix
+++ b/settings/quickshell.nix
@@ -2011,6 +2011,7 @@ in
                         width: launcherPanel.visible ? launcherPanel.width : 0
                         height: launcherPanel.visible ? launcherPanel.height : 0
                     }
+                    ${lib.optionalString (!isMacbook) ''
                     // Archie's ball. The rest of this surface is click-through,
                     // so without a hole here you could never pick it up.
                     Region {
@@ -2019,6 +2020,7 @@ in
                         width: archieDog.hitW
                         height: archieDog.hitW
                     }
+                    ''}
                 }
 
                 Item {
@@ -7351,6 +7353,7 @@ in
                 // same rects the frame shader draws, paired with the way each
                 // one slides out: dropdowns and toasts rightward out of the
                 // bar column, the launcher up out of the bottom frame band.
+                ${lib.optionalString (!isMacbook) ''
                 Weird {
                     pushers: [
                         { rect: chromeSdf.panel,    push: Qt.point(1, 0) },
@@ -7361,6 +7364,7 @@ in
 
                 // Archie. One dog, primary screen only.
                 Archie { id: archieDog; primary: bar.screen === Quickshell.screens[0] }
+                ''}
             }
           '';
         };