Nara: Organise Homebrew package modules

11 files changed, 106 insertions, 88 deletions

diff --git a/modules/mac/programs/homebrew/packages/brews.nix b/modules/mac/programs/homebrew/packages/brews.nix
deleted file mode 100644
index 9c9a935..0000000
--- a/modules/mac/programs/homebrew/packages/brews.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  homebrew.brews = [
-    "swiftlint"
-    "gpg"
-    "pinentry-mac"
-    "sudo-touchid"
-    "appwrite"
-    "graphaello"
-    "mas"
-    "zsh-autosuggestions"
-    "zsh-vi-mode"
-    "vapor"
-    "rustup"
-    "earthly"
-    "rye"
-    "swiftformat"
-    "hcloud"
-    "cc65"
-    "convco"
-    "animdl"
-    "zoxide"
-    "fzf"
-    "mint"
-    "socat"
-    "node@23"
-    "xcdiff"
-    "storj-uplink"
-    "codespell"
-    "ninja"
-    "koekeishiya/formulae/yabai"
-    "koekeishiya/formulae/skhd"
-    "httpie"
-  ];
-}
diff --git a/modules/mac/programs/homebrew/packages/casks/default.nix b/modules/mac/programs/homebrew/packages/casks/default.nix
index a9d606f..953acf5 100644
--- a/modules/mac/programs/homebrew/packages/casks/default.nix
+++ b/modules/mac/programs/homebrew/packages/casks/default.nix
@@ -4,11 +4,8 @@
     ./audio.nix
     ./browser.nix
     ./communication.nix
-    ./development.nix
     ./gaming.nix
-    ./improved-macos.nix
     ./notation.nix
-    ./video.nix
   ];
 
   homebrew.casks = [
diff --git a/modules/mac/programs/homebrew/packages/casks/development.nix b/modules/mac/programs/homebrew/packages/casks/development.nix
deleted file mode 100644
index 9fc9b2d..0000000
--- a/modules/mac/programs/homebrew/packages/casks/development.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  homebrew.casks = [
-    "bruno"
-    "tuist"
-    "ghostty"
-    "zed"
-    "orbstack"
-    # "stratoshark"
-    "arduino-ide"
-    "fork"
-    "ltspice"
-    "utm"
-    "knuff"
-    "wireshark"
-    "raspberry-pi-imager"
-    "sf-symbols"
-    "wakatime"
-    "linear-linear"
-    "sublime-text"
-    "serial"
-    "thonny"
-    "visual-studio-code"
-    "virtual-ii"
-    "httpie"
-    "json-viewer"
-  ];
-}
diff --git a/modules/mac/programs/homebrew/packages/casks/improved-macos.nix b/modules/mac/programs/homebrew/packages/casks/improved-macos.nix
deleted file mode 100644
index 7063305..0000000
--- a/modules/mac/programs/homebrew/packages/casks/improved-macos.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  homebrew.casks = [
-    "alt-tab"
-    "iterm2"
-    "mac-mouse-fix"
-    "macs-fan-control"
-    "latest"
-    "quitter"
-    "raycast"
-    "smoothscroll"
-    "linearmouse"
-    "go64"
-    "homerow"
-  ];
-}
diff --git a/modules/mac/programs/homebrew/packages/casks/video.nix b/modules/mac/programs/homebrew/packages/casks/video.nix
deleted file mode 100644
index ead5839..0000000
--- a/modules/mac/programs/homebrew/packages/casks/video.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  homebrew.casks = [
-    "iina"
-    "obs"
-    "freetube"
-    "vlc"
-  ];
-}
diff --git a/modules/mac/programs/homebrew/packages/default.nix b/modules/mac/programs/homebrew/packages/default.nix
index 485e37c..e04feb6 100644
--- a/modules/mac/programs/homebrew/packages/default.nix
+++ b/modules/mac/programs/homebrew/packages/default.nix
@@ -2,6 +2,10 @@
   imports = [
     ./casks
     ./auditing.nix
-    ./brews.nix
+    ./development.nix
+    ./improved-macos.nix
+    ./shell.nix
+    ./system.nix
+    ./video.nix
   ];
 }
diff --git a/modules/mac/programs/homebrew/packages/development.nix b/modules/mac/programs/homebrew/packages/development.nix
new file mode 100644
index 0000000..e0e2703
--- /dev/null
+++ b/modules/mac/programs/homebrew/packages/development.nix
@@ -0,0 +1,51 @@
+{
+  homebrew = {
+    casks = [
+      "bruno"
+      "tuist"
+      "ghostty"
+      "zed"
+      "orbstack"
+      # "stratoshark"
+      "arduino-ide"
+      "fork"
+      "ltspice"
+      "utm"
+      "knuff"
+      "wireshark"
+      "raspberry-pi-imager"
+      "sf-symbols"
+      "wakatime"
+      "linear-linear"
+      "sublime-text"
+      "serial"
+      "thonny"
+      "visual-studio-code"
+      "virtual-ii"
+      "httpie"
+      "json-viewer"
+    ];
+
+    brews = [
+      "httpie"
+      "mint"
+      "socat"
+      "node@23"
+      "xcdiff"
+      "storj-uplink"
+      "codespell"
+      "ninja"
+      "vapor"
+      "rustup"
+      "earthly"
+      "rye"
+      "swiftformat"
+      "swiftlint"
+      "appwrite"
+      "graphaello"
+      "cc65"
+      "convco"
+      "hcloud"
+    ];
+  };
+}
diff --git a/modules/mac/programs/homebrew/packages/improved-macos.nix b/modules/mac/programs/homebrew/packages/improved-macos.nix
new file mode 100644
index 0000000..9780409
--- /dev/null
+++ b/modules/mac/programs/homebrew/packages/improved-macos.nix
@@ -0,0 +1,22 @@
+{
+  homebrew = {
+    casks = [
+      "alt-tab"
+      "iterm2"
+      "mac-mouse-fix"
+      "macs-fan-control"
+      "latest"
+      "quitter"
+      "raycast"
+      "smoothscroll"
+      "linearmouse"
+      "go64"
+      "homerow"
+    ];
+
+    brews = [
+      "koekeishiya/formulae/yabai"
+      "koekeishiya/formulae/skhd"
+    ];
+  };
+}
diff --git a/modules/mac/programs/homebrew/packages/shell.nix b/modules/mac/programs/homebrew/packages/shell.nix
new file mode 100644
index 0000000..567264f
--- /dev/null
+++ b/modules/mac/programs/homebrew/packages/shell.nix
@@ -0,0 +1,8 @@
+{
+  homebrew.brews = [
+    "zsh-autosuggestions"
+    "zsh-vi-mode"
+    "zoxide"
+    "fzf"
+  ];
+}
diff --git a/modules/mac/programs/homebrew/packages/system.nix b/modules/mac/programs/homebrew/packages/system.nix
new file mode 100644
index 0000000..6df2f91
--- /dev/null
+++ b/modules/mac/programs/homebrew/packages/system.nix
@@ -0,0 +1,8 @@
+{
+  homebrew.brews = [
+    "gpg"
+    "pinentry-mac"
+    "sudo-touchid"
+    "mas"
+  ];
+}
diff --git a/modules/mac/programs/homebrew/packages/video.nix b/modules/mac/programs/homebrew/packages/video.nix
new file mode 100644
index 0000000..f21d4af
--- /dev/null
+++ b/modules/mac/programs/homebrew/packages/video.nix
@@ -0,0 +1,12 @@
+{
+  homebrew = {
+    casks = [
+      "iina"
+      "obs"
+      "freetube"
+      "vlc"
+    ];
+
+    brews = [ "animdl" ];
+  };
+}