darwin: merge application configuration from application.nix into desktop.nix

makes darwin/applications useful for when programs differ between mac and
linux

flake.nix

@@ -47,7 +47,6 @@
         ./modules/darwin/desktop.nix
         ./modules/darwin/hardware.nix
         ./modules/darwin/nix.nix
-        ./modules/darwin/brew.nix
 
         ./hosts/faye/conf.nix
         ./hosts/darwin-common.nix

modules/darwin/applications.nix

@@ -2,13 +2,6 @@
 
 {
   # dock
-  system.defaults.dock.autohide = true;
-  system.defaults.dock.autohide-delay = 0.01;
-  system.defaults.dock.autohide-time-modifier = 0.2;
-  system.defaults.dock.mineffect = "scale";
-  system.defaults.dock.orientation = "left";
-  system.defaults.dock.show-recents = true;
-  system.defaults.dock.tilesize = 48;
   system.defaults.dock.persistent-apps = [
     "/Applications/Firefox.app"
     "/Applications/Ghostty.app"
@@ -23,32 +16,20 @@
     "${pkgs.gimp}/Applications/GNU Image Manipulation Program.app"
   ];
   
-  # finder
+  # nix pkgs
-  system.defaults.finder = {
+  environment.systemPackages = with pkgs; [
-    AppleShowAllExtensions = true;
+  ]
-    AppleShowAllFiles = true;
-    FXEnableExtensionChangeWarning = false;
-    FXPreferredViewStyle = "clmv";
-    FXRemoveOldTrashItems = true;
-    NewWindowTarget = "Home";
-    ShowStatusBar = true;
-    _FXShowPosixPathInTitle = true;
-    _FXSortFoldersFirst = true;
 
-    CreateDesktop = true; # desktop icons
+  # homebrew pkgs
-    ShowHardDrivesOnDesktop = true;
+  homebrew = {
-    ShowExternalHardDrivesOnDesktop = true;
+    enable = true;
-    ShowMountedServersOnDesktop = true;
+    onActivation.cleanup = "zap";
-    ShowRemovableMediaOnDesktop = true;
+    casks = [
-  };
+      "firefox"
-
+      "thunderbird"
-  # activity monitor
+      "ghostty"
-  system.defaults.ActivityMonitor = {
+      "whisky"
-    IconType = 0;
+    ];
-    OpenMainWindow = true;
-    ShowCategory = 100;
-    SortColumn = "CPUUsage";
-    SortDirection = 0;
   };
 
   # hotkey daemon

modules/darwin/brew.nix

@@ -1,14 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  homebrew = {
-    enable = true;
-    onActivation.cleanup = "zap";
-    casks = [
-      "firefox"
-      "thunderbird"
-      "ghostty"
-      "whisky"
-    ];
-  };
-}

modules/darwin/desktop.nix

@@ -43,4 +43,41 @@
   system.defaults.dock.mru-spaces = false; # dont rearange spaces based on usage
   system.defaults.spaces.spans-displays = true; # displays have different spaces
   system.defaults.NSGlobalDomain.AppleSpacesSwitchOnActivate = true;
+
+  # dock
+  system.defaults.dock.autohide = true;
+  system.defaults.dock.autohide-delay = 0.01;
+  system.defaults.dock.autohide-time-modifier = 0.2;
+  system.defaults.dock.mineffect = "scale";
+  system.defaults.dock.orientation = "left";
+  system.defaults.dock.show-recents = true;
+  system.defaults.dock.tilesize = 48;
+
+  # finder
+  system.defaults.finder = {
+    AppleShowAllExtensions = true;
+    AppleShowAllFiles = true;
+    FXEnableExtensionChangeWarning = false;
+    FXPreferredViewStyle = "clmv";
+    FXRemoveOldTrashItems = true;
+    NewWindowTarget = "Home";
+    ShowStatusBar = true;
+    _FXShowPosixPathInTitle = true;
+    _FXSortFoldersFirst = true;
+
+    CreateDesktop = true; # desktop icons
+    ShowHardDrivesOnDesktop = true;
+    ShowExternalHardDrivesOnDesktop = true;
+    ShowMountedServersOnDesktop = true;
+    ShowRemovableMediaOnDesktop = true;
+  };
+
+  # activity monitor
+  system.defaults.ActivityMonitor = {
+    IconType = 0;
+    OpenMainWindow = true;
+    ShowCategory = 100;
+    SortColumn = "CPUUsage";
+    SortDirection = 0;
+  };
 }