From e57c79287405976f1b754b3c56d221d174333888 Mon Sep 17 00:00:00 2001
From: Olaf <github@dacht.net>
Date: Fri, 31 Jul 2026 17:47:11 +0200
Subject: [PATCH] Moved cask and and other homebrew to the brewery file

---
 flake.nix                       |  2 +-
 modules/darwin/brewery.nix      | 83 +++++++++++++++++++++++++++++++--
 modules/darwin/casks.nix        | 79 -------------------------------
 modules/darwin/default.nix      |  2 +-
 modules/darwin/home-manager.nix |  5 +-
 5 files changed, 83 insertions(+), 88 deletions(-)
 delete mode 100644 modules/darwin/casks.nix

diff --git a/flake.nix b/flake.nix
index 7514ee2..3011d90 100644
--- a/flake.nix
+++ b/flake.nix
@@ -137,7 +137,7 @@
                   "homebrew/homebrew-cask" = homebrew-cask;
                 };
                 mutableTaps = false;
-                autoMigrate = true;
+                # autoMigrate = true;
               };
               home-manager.sharedModules = [
                 #                mac-app-util.homeManagerModules.default
diff --git a/modules/darwin/brewery.nix b/modules/darwin/brewery.nix
index 019c442..7a13fe6 100644
--- a/modules/darwin/brewery.nix
+++ b/modules/darwin/brewery.nix
@@ -6,14 +6,15 @@ homebrew = {
       brewfile = true;
     };
     brews = []; 
-    casks = pkgs.callPackage ./casks.nix { };
+  
     onActivation = {
-      cleanup = "check";
+      cleanup = "uninstall";
       autoUpdate = true;
       upgrade = true;
 
     };
 
+    masApps = {
     # These app IDs are from using the mas CLI app
     # mas = mac app store
     # https://github.com/mas-cli/mas
@@ -24,8 +25,6 @@ homebrew = {
     # If you have previously added these apps to your Mac App Store profile (but not installed them on this system),
     # you may receive an error message "Redownload Unavailable with This Apple ID".
     # This message is safe to ignore.
-
-    masApps = {
       "1Password for Safari" = 1569813296; # (8.10.82)
       "Affinity Designer 2" = 1616831348;
       "Affinity Photo 2: Image Editor" = 1616822987;
@@ -47,6 +46,82 @@ homebrew = {
       "Wireguard" = 1451685025; # (1.0.16)
       ###      "1Password: Password Manager" = 1511601750; # (8.11.0) Does not seem to insta
     };
+
+    casks = [
+   # Development Tools
+  "arduino-ide"
+  "docker-desktop"
+  "iterm2"
+  "oracle-jdk"
+  "visual-studio-code"
+
+  # Creative tools
+  "blender"
+  "gimp"
+  "inkscape"
+  "vcv-rack"
+  #"affinity-designer"
+  #"affinity-photo"
+  #"affinity-publisher"
+
+  # Communication Tools
+  "adium"
+  "discord"
+  "signal"
+  "webex"
+  "whatsapp"
+  "zoom"
+
+  # Utility Tools
+
+  "blackhole-16ch"
+  "blackhole-2ch"
+  "box-drive"
+  "box-tools"
+  "daisydisk"
+  "karabiner-elements"
+  "keybase"
+  "moonlight"
+  "spamsieve"
+  "syncthing-app"
+  "synology-drive"
+
+  # Entertainment Tools
+  "qobuz"
+  "steam"
+  "handbrake-app"
+  "jellyfin-media-player"
+  "mediaelch"
+  "obs"
+  "vimediamanager"
+  "vlc"
+
+  # Productivity Tools
+  "1Password"
+  "bitwarden"
+  "calibre"
+  "dbeaver-community"
+  "element"
+  "gpg-suite"
+  "macdown-3000"
+  "mailmate@beta"
+  "orcaslicer"
+  "remanager"
+  "qmk-toolbox"
+  "smartsheet"
+  #  "sqlitestudio" # Doesn't work without Rosetta
+
+  #  "virtualbox" # build error?
+  "copilot-cli"
+
+  # Browsers
+  "brave-browser"
+  "firefox"
+  "google-chrome"
+
+  # x11
+  "xquartz"
+    ];  
   };
 
   }
\ No newline at end of file
diff --git a/modules/darwin/casks.nix b/modules/darwin/casks.nix
deleted file mode 100644
index 95568a2..0000000
--- a/modules/darwin/casks.nix
+++ /dev/null
@@ -1,79 +0,0 @@
-_:
-
-[
-  # Development Tools
-  "arduino-ide"
-  "docker-desktop"
-  "iterm2"
-  "oracle-jdk"
-  "visual-studio-code"
-
-  # Creative tools
-  "blender"
-  "gimp"
-  "inkscape"
-  "vcv-rack"
-  #"affinity-designer"
-  #"affinity-photo"
-  #"affinity-publisher"
-
-  # Communication Tools
-  "adium"
-  "discord"
-  "signal"
-  "webex"
-  "whatsapp"
-  "zoom"
-
-
-  # Utility Tools
-
-  "blackhole-16ch"
-  "blackhole-2ch"
-  "box-drive"
-  "box-tools"
-  "daisydisk"
-  "karabiner-elements"
-  "keybase"
-  "spamsieve"  
-  "syncthing-app"
-  "synology-drive"
-
-  # Entertainment Tools
-   "qobuz"
-   "steam"
-  "handbrake-app"
-  "jellyfin-media-player"
-  "mediaelch"
-  "obs"
-  "vimediamanager"  
-  "vlc"
-
-  # Productivity Tools
-  "1Password"
-  "bitwarden"
-  "calibre"
-  "dbeaver-community"
-  "element"
-  "gpg-suite"
-  "macdown-3000"
-  "mailmate@beta"
-  "orcaslicer"
-  "remanager"
-  "qmk-toolbox"  
-  "smartsheet"
-#  "sqlitestudio" # Doesn't work without Rosetta
-
-   #  "virtualbox" # build error?
-  "copilot-cli"
-
-  # Browsers
-  "brave-browser"
-  "firefox"
-  "google-chrome"
- 
- 
-
-# x11
-"xquartz"
-]
diff --git a/modules/darwin/default.nix b/modules/darwin/default.nix
index b2da1a0..611a4c0 100644
--- a/modules/darwin/default.nix
+++ b/modules/darwin/default.nix
@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 
 let
-  emacsOverlaySha256 = "0pqnl05j86pyvrlqh5kk4sximi749xqgiffq47grw7v98nqd2yin";
+  emacsOverlaySha256 = "1923mymd50zpz0mq34jpcn6jgq6li92j8wvkarl0y594c01x52g9";
 in
 {
   home-manager.backupFileExtension = "nix-backup";
diff --git a/modules/darwin/home-manager.nix b/modules/darwin/home-manager.nix
index c6b911c..a6d1963 100644
--- a/modules/darwin/home-manager.nix
+++ b/modules/darwin/home-manager.nix
@@ -20,6 +20,7 @@ in
 
   imports = [
     ./dock
+    ./brewery.nix
   ];
 
   # It me
@@ -39,9 +40,7 @@ in
     ];
   };
 
-  imports = [
-    ./homebrew.nix
-  ];
+
 
   # Enable home-manager
   home-manager = {