From 96955700d4aab264a60d47929f6d2cb1b9967a7d Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings@gmail.com>
Date: Fri, 9 May 2025 11:18:52 -0500
Subject: [PATCH] Prepare for new IVR Mac machine

Getting code prepared for arrival of the new Mac system
Adding the basic casks that I need
---
 darwin/default.nix           |  5 ++---
 darwin/hosts/ivr/default.nix | 11 +++++++++++
 modules/darwin/default.nix   | 20 +++++++++++++-------
 3 files changed, 26 insertions(+), 10 deletions(-)
 create mode 100644 darwin/hosts/ivr/default.nix

diff --git a/darwin/default.nix b/darwin/default.nix
index abb607c..eff30a0 100644
--- a/darwin/default.nix
+++ b/darwin/default.nix
@@ -1,12 +1,12 @@
 { top, overlays, ... }:
 let
+  inherit (top.nixunstable) lib;
   mac =
     {
       system ? "aarch64-darwin",
       name,
       channel ? top.nixunstable,
       hm ? top.hmunstable,
-      extraMods ? [ ],
     }:
     let
       nixpkgs = import channel { inherit system overlays; };
@@ -26,8 +26,7 @@ let
         }
         hm.darwinModules.home-manager
         top.self.modules.darwinModule
-        ./${name}
-      ] ++ extraMods;
+      ] ++ lib.optionals (builtins.pathExists ./hosts/${name}) [ ./hosts/${name} ];
     };
 in
 rec {
diff --git a/darwin/hosts/ivr/default.nix b/darwin/hosts/ivr/default.nix
new file mode 100644
index 0000000..14a0e75
--- /dev/null
+++ b/darwin/hosts/ivr/default.nix
@@ -0,0 +1,11 @@
+{ ... }:
+{
+  homebrews = {
+    enable = true;
+    casks = [
+      "firefox"
+      "onlyoffice"
+      "zed"
+    ];
+  };
+}
diff --git a/modules/darwin/default.nix b/modules/darwin/default.nix
index 4a212d7..15f2dfb 100644
--- a/modules/darwin/default.nix
+++ b/modules/darwin/default.nix
@@ -1,7 +1,7 @@
 { ... }:
 {
   imports = [ ../baseline.nix ];
-  system.stateVersion = 4;
+
   home-manager = {
     useGlobalPkgs = true;
     users."gregory.hellings" = import ../../home/home.nix;
@@ -11,14 +11,20 @@
       home = "/Users/gregory.hellings";
     };
   };
-  users.users."gregory.hellings".home = "/Users/gregory.hellings";
-  programs = {
-    zsh.enable = true;
-    bash.enable = true;
-  };
-  services.nix-daemon.enable = true;
+
   nix = {
     gc.interval.Hour = 24;
     settings.auto-optimise-store = false; # Darwin bugs?
   };
+
+  programs = {
+    zsh.enable = true;
+    bash.enable = true;
+  };
+
+  services.nix-daemon.enable = true;
+
+  system.stateVersion = 4;
+
+  users.users."gregory.hellings".home = "/Users/gregory.hellings";
 }