From e37d4b620fbb57a3b5685d7daf7cbabe381f043b Mon Sep 17 00:00:00 2001
From: Fuwn <contact@fuwn.me>
Date: Mon, 26 Jan 2026 04:30:38 -0800
Subject: refactor(modules/mac): Move files from casks to packages

---
 modules/mac/programs/homebrew/packages/ai.nix      | 24 ++++++++++++++++
 modules/mac/programs/homebrew/packages/audio.nix   | 16 +++++++++++
 modules/mac/programs/homebrew/packages/browser.nix | 12 ++++++++
 .../mac/programs/homebrew/packages/casks/ai.nix    | 24 ----------------
 .../mac/programs/homebrew/packages/casks/audio.nix | 16 -----------
 .../programs/homebrew/packages/casks/browser.nix   | 12 --------
 .../homebrew/packages/casks/communication.nix      |  8 ------
 .../programs/homebrew/packages/casks/default.nix   | 33 ----------------------
 .../programs/homebrew/packages/casks/gaming.nix    | 14 ---------
 .../programs/homebrew/packages/casks/notation.nix  | 15 ----------
 .../programs/homebrew/packages/communication.nix   |  8 ++++++
 modules/mac/programs/homebrew/packages/default.nix |  7 ++++-
 modules/mac/programs/homebrew/packages/gaming.nix  | 14 +++++++++
 .../mac/programs/homebrew/packages/notation.nix    | 15 ++++++++++
 modules/mac/programs/homebrew/packages/system.nix  | 20 +++++++++++++
 15 files changed, 115 insertions(+), 123 deletions(-)
 create mode 100644 modules/mac/programs/homebrew/packages/ai.nix
 create mode 100644 modules/mac/programs/homebrew/packages/audio.nix
 create mode 100644 modules/mac/programs/homebrew/packages/browser.nix
 delete mode 100644 modules/mac/programs/homebrew/packages/casks/ai.nix
 delete mode 100644 modules/mac/programs/homebrew/packages/casks/audio.nix
 delete mode 100644 modules/mac/programs/homebrew/packages/casks/browser.nix
 delete mode 100644 modules/mac/programs/homebrew/packages/casks/communication.nix
 delete mode 100644 modules/mac/programs/homebrew/packages/casks/default.nix
 delete mode 100644 modules/mac/programs/homebrew/packages/casks/gaming.nix
 delete mode 100644 modules/mac/programs/homebrew/packages/casks/notation.nix
 create mode 100644 modules/mac/programs/homebrew/packages/communication.nix
 create mode 100644 modules/mac/programs/homebrew/packages/gaming.nix
 create mode 100644 modules/mac/programs/homebrew/packages/notation.nix

diff --git a/modules/mac/programs/homebrew/packages/ai.nix b/modules/mac/programs/homebrew/packages/ai.nix
new file mode 100644
index 0000000..ef0751e
--- /dev/null
+++ b/modules/mac/programs/homebrew/packages/ai.nix
@@ -0,0 +1,24 @@
+{
+  homebrew.casks = [
+    "ollamac"
+    # "anythingllm"
+    "msty"
+    "chatgpt"
+    "claude"
+    "ollama-app"
+    "jan"
+    "lm-studio"
+    "boltai"
+    "comfyui"
+    "claude-code"
+    "antigravity"
+    "opencode-desktop"
+    "wispr-flow"
+  ];
+
+  homebrew.brews = [
+    "gemini-cli"
+    "codex"
+    "opencode"
+  ];
+}
diff --git a/modules/mac/programs/homebrew/packages/audio.nix b/modules/mac/programs/homebrew/packages/audio.nix
new file mode 100644
index 0000000..2faa6dd
--- /dev/null
+++ b/modules/mac/programs/homebrew/packages/audio.nix
@@ -0,0 +1,16 @@
+{
+  homebrew = {
+    casks = [
+      "audio-hijack"
+      "spotify"
+      "vb-cable"
+      "rockboxutility"
+      "chirp"
+      "blackhole-2ch"
+      "sunvox"
+      "qobuz"
+    ];
+
+    brews = [ "portaudio" ];
+  };
+}
diff --git a/modules/mac/programs/homebrew/packages/browser.nix b/modules/mac/programs/homebrew/packages/browser.nix
new file mode 100644
index 0000000..c52bf29
--- /dev/null
+++ b/modules/mac/programs/homebrew/packages/browser.nix
@@ -0,0 +1,12 @@
+{
+  homebrew.casks = [
+    "arc"
+    "lagrange"
+    "google-chrome"
+    "zen"
+    "tor-browser"
+    "google-chrome@dev"
+    "orion"
+    "chatgpt-atlas"
+  ];
+}
diff --git a/modules/mac/programs/homebrew/packages/casks/ai.nix b/modules/mac/programs/homebrew/packages/casks/ai.nix
deleted file mode 100644
index ef0751e..0000000
--- a/modules/mac/programs/homebrew/packages/casks/ai.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  homebrew.casks = [
-    "ollamac"
-    # "anythingllm"
-    "msty"
-    "chatgpt"
-    "claude"
-    "ollama-app"
-    "jan"
-    "lm-studio"
-    "boltai"
-    "comfyui"
-    "claude-code"
-    "antigravity"
-    "opencode-desktop"
-    "wispr-flow"
-  ];
-
-  homebrew.brews = [
-    "gemini-cli"
-    "codex"
-    "opencode"
-  ];
-}
diff --git a/modules/mac/programs/homebrew/packages/casks/audio.nix b/modules/mac/programs/homebrew/packages/casks/audio.nix
deleted file mode 100644
index 2faa6dd..0000000
--- a/modules/mac/programs/homebrew/packages/casks/audio.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  homebrew = {
-    casks = [
-      "audio-hijack"
-      "spotify"
-      "vb-cable"
-      "rockboxutility"
-      "chirp"
-      "blackhole-2ch"
-      "sunvox"
-      "qobuz"
-    ];
-
-    brews = [ "portaudio" ];
-  };
-}
diff --git a/modules/mac/programs/homebrew/packages/casks/browser.nix b/modules/mac/programs/homebrew/packages/casks/browser.nix
deleted file mode 100644
index c52bf29..0000000
--- a/modules/mac/programs/homebrew/packages/casks/browser.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  homebrew.casks = [
-    "arc"
-    "lagrange"
-    "google-chrome"
-    "zen"
-    "tor-browser"
-    "google-chrome@dev"
-    "orion"
-    "chatgpt-atlas"
-  ];
-}
diff --git a/modules/mac/programs/homebrew/packages/casks/communication.nix b/modules/mac/programs/homebrew/packages/casks/communication.nix
deleted file mode 100644
index a852163..0000000
--- a/modules/mac/programs/homebrew/packages/casks/communication.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  homebrew.casks = [
-    "zoom"
-    "grammarly-desktop"
-    "discord"
-    "loom"
-  ];
-}
diff --git a/modules/mac/programs/homebrew/packages/casks/default.nix b/modules/mac/programs/homebrew/packages/casks/default.nix
deleted file mode 100644
index 2045f58..0000000
--- a/modules/mac/programs/homebrew/packages/casks/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  imports = [
-    ./ai.nix
-    ./audio.nix
-    ./browser.nix
-    ./communication.nix
-    ./gaming.nix
-    ./notation.nix
-  ];
-
-  homebrew.casks = [
-    "pearcleaner"
-    "coconutbattery"
-    "webtorrent"
-    "daisydisk"
-    # "onyx"
-    "sony-ps-remote-play"
-    # "retroarch"
-    "netnewswire"
-    "prettyclean"
-    "imageoptim"
-    "setapp"
-    # "parallels"
-    "proton-drive"
-    "proton-mail"
-    "proton-pass"
-    "protonvpn"
-    "google-drive"
-    "notion-calendar"
-    "motrix"
-    "mini-vmac"
-  ];
-}
diff --git a/modules/mac/programs/homebrew/packages/casks/gaming.nix b/modules/mac/programs/homebrew/packages/casks/gaming.nix
deleted file mode 100644
index d032e05..0000000
--- a/modules/mac/programs/homebrew/packages/casks/gaming.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  homebrew.casks = [
-    "crossover"
-    "minecraft"
-    "epic-games"
-    "heroic"
-    "whisky"
-    "nvidia-geforce-now"
-    "playcover-community"
-    "roblox"
-    "steam"
-    "porting-kit"
-  ];
-}
diff --git a/modules/mac/programs/homebrew/packages/casks/notation.nix b/modules/mac/programs/homebrew/packages/casks/notation.nix
deleted file mode 100644
index 7023159..0000000
--- a/modules/mac/programs/homebrew/packages/casks/notation.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  homebrew = {
-    casks = [
-      "anki"
-      # "mochi"
-      "notion"
-      "raindropio"
-      # "textual"
-      "texifier"
-      "monodraw"
-    ];
-
-    brews = [ "gdown" ];
-  };
-}
diff --git a/modules/mac/programs/homebrew/packages/communication.nix b/modules/mac/programs/homebrew/packages/communication.nix
new file mode 100644
index 0000000..a852163
--- /dev/null
+++ b/modules/mac/programs/homebrew/packages/communication.nix
@@ -0,0 +1,8 @@
+{
+  homebrew.casks = [
+    "zoom"
+    "grammarly-desktop"
+    "discord"
+    "loom"
+  ];
+}
diff --git a/modules/mac/programs/homebrew/packages/default.nix b/modules/mac/programs/homebrew/packages/default.nix
index e04feb6..73290b9 100644
--- a/modules/mac/programs/homebrew/packages/default.nix
+++ b/modules/mac/programs/homebrew/packages/default.nix
@@ -1,9 +1,14 @@
 {
   imports = [
-    ./casks
     ./auditing.nix
+    ./ai.nix
+    ./audio.nix
+    ./browser.nix
+    ./communication.nix
     ./development.nix
+    ./gaming.nix
     ./improved-macos.nix
+    ./notation.nix
     ./shell.nix
     ./system.nix
     ./video.nix
diff --git a/modules/mac/programs/homebrew/packages/gaming.nix b/modules/mac/programs/homebrew/packages/gaming.nix
new file mode 100644
index 0000000..d032e05
--- /dev/null
+++ b/modules/mac/programs/homebrew/packages/gaming.nix
@@ -0,0 +1,14 @@
+{
+  homebrew.casks = [
+    "crossover"
+    "minecraft"
+    "epic-games"
+    "heroic"
+    "whisky"
+    "nvidia-geforce-now"
+    "playcover-community"
+    "roblox"
+    "steam"
+    "porting-kit"
+  ];
+}
diff --git a/modules/mac/programs/homebrew/packages/notation.nix b/modules/mac/programs/homebrew/packages/notation.nix
new file mode 100644
index 0000000..7023159
--- /dev/null
+++ b/modules/mac/programs/homebrew/packages/notation.nix
@@ -0,0 +1,15 @@
+{
+  homebrew = {
+    casks = [
+      "anki"
+      # "mochi"
+      "notion"
+      "raindropio"
+      # "textual"
+      "texifier"
+      "monodraw"
+    ];
+
+    brews = [ "gdown" ];
+  };
+}
diff --git a/modules/mac/programs/homebrew/packages/system.nix b/modules/mac/programs/homebrew/packages/system.nix
index 526672f..a0a8e65 100644
--- a/modules/mac/programs/homebrew/packages/system.nix
+++ b/modules/mac/programs/homebrew/packages/system.nix
@@ -13,6 +13,26 @@
       "chrome-remote-desktop-host"
       "surfshark"
       "parsec"
+      "pearcleaner"
+      "coconutbattery"
+      "webtorrent"
+      "daisydisk"
+      # "onyx"
+      "sony-ps-remote-play"
+      # "retroarch"
+      "netnewswire"
+      "prettyclean"
+      "imageoptim"
+      "setapp"
+      # "parallels"
+      "proton-drive"
+      "proton-mail"
+      "proton-pass"
+      "protonvpn"
+      "google-drive"
+      "notion-calendar"
+      "motrix"
+      "mini-vmac"
     ];
   };
 }
-- 
cgit v1.2.3