From d45e239926d459400d623b24f7d0fccddbe544d5 Mon Sep 17 00:00:00 2001
From: Olaf <github@dacht.net>
Date: Thu, 30 Jul 2026 22:01:25 +0200
Subject: [PATCH] Finetuning brew and casks

---
 flake.nix                       |  9 ++-------
 modules/darwin/casks.nix        |  5 ++---
 modules/darwin/home-manager.nix | 21 +++++++++++++++------
 modules/darwin/packages.nix     |  1 +
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/flake.nix b/flake.nix
index d0e3af9..7514ee2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,10 +24,7 @@
       url = "github:zhaofengli-wip/nix-homebrew";
       inputs.brew-src.follows = "brew-src";
     };
-    homebrew-bundle = {
-      url = "github:homebrew/homebrew-bundle";
-      flake = false;
-    };
+
     homebrew-core = {
       url = "github:homebrew/homebrew-core";
       flake = false;
@@ -60,7 +57,6 @@
       self,
       darwin,
       nix-homebrew,
-      homebrew-bundle,
       homebrew-core,
       homebrew-cask,
       home-manager,
@@ -137,9 +133,8 @@
                 inherit user;
                 enable = true;
                 taps = {
-                 "homebrew/homebrew-core" = homebrew-core;
+                  "homebrew/homebrew-core" = homebrew-core;
                   "homebrew/homebrew-cask" = homebrew-cask;
-                  "homebrew/homebrew-bundle" = homebrew-bundle;
                 };
                 mutableTaps = false;
                 autoMigrate = true;
diff --git a/modules/darwin/casks.nix b/modules/darwin/casks.nix
index 2f6aef4..95568a2 100644
--- a/modules/darwin/casks.nix
+++ b/modules/darwin/casks.nix
@@ -35,7 +35,6 @@ _:
   "daisydisk"
   "karabiner-elements"
   "keybase"
-  "microsoft-remote-desktop"
   "spamsieve"  
   "syncthing-app"
   "synology-drive"
@@ -58,13 +57,13 @@ _:
   "element"
   "gpg-suite"
   "macdown-3000"
-  "mailmate"
+  "mailmate@beta"
   "orcaslicer"
   "remanager"
   "qmk-toolbox"  
   "smartsheet"
 #  "sqlitestudio" # Doesn't work without Rosetta
-   "tigervnc"
+
    #  "virtualbox" # build error?
   "copilot-cli"
 
diff --git a/modules/darwin/home-manager.nix b/modules/darwin/home-manager.nix
index af74cbe..75d4ae5 100644
--- a/modules/darwin/home-manager.nix
+++ b/modules/darwin/home-manager.nix
@@ -32,13 +32,15 @@ in
 
   homebrew = {
     enable = true;
-    
+    global = {
+      brewfile = true;
+    };
     casks = pkgs.callPackage ./casks.nix { };
     onActivation = {
-      # Keep activation deterministic while avoiding expensive update/upgrade on every switch.
-      cleanup = "uninstall";
-      autoUpdate = false;
-      upgrade = false;
+      cleanup = "none";
+      autoUpdate = true;
+      upgrade = true;
+
     };
 
     # These app IDs are from using the mas CLI app
@@ -68,9 +70,9 @@ in
       "Night Sky" = 475772902; # 475772902
       "Native SQLite Manager" = 1416282836; # (1.31.0)
       "Remarkable Desktop" = 1276493162; # (3.19.0)
-
       "Slack for Desktop" = 803453959; # (4.45.60)
       "WiFi Explorer: Scanner" = 494803304; # (3.5.6)
+      "Windows App Installer" = 1295203466; # (1.0.16)
       "Wireguard" = 1451685025; # (1.0.16)
       ###      "1Password: Password Manager" = 1511601750; # (8.11.0) Does not seem to insta
     };
@@ -115,6 +117,13 @@ in
                     . /nix/var/nix/profiles/default/etc/profile.d/nix.sh
                   fi
 
+                  if [[ "$TERM" == "alacritty" ]]; then
+                    export TERMINFO_DIRS="$HOME/.nix-profile/share/terminfo:/run/current-system/sw/share/terminfo:/nix/var/nix/profiles/default/share/terminfo:/usr/share/terminfo"
+                    if ! infocmp alacritty >/dev/null 2>&1; then
+                      export TERM="xterm-256color"
+                    fi
+                  fi
+
                   # GPGAgent for SSH
                   export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
 
diff --git a/modules/darwin/packages.nix b/modules/darwin/packages.nix
index aece33e..cbab579 100644
--- a/modules/darwin/packages.nix
+++ b/modules/darwin/packages.nix
@@ -30,6 +30,7 @@ with pkgs;
   btop
   coreutils
   difftastic
+  freerdp
   htop
   killall
   minicom