Darwin reorg

home/default.nix

@@ -52,29 +52,12 @@
       unzip
     ];
     guiApps = [cinny-desktop code-cursor];
-    darwinApps = [
-      chatgpt
-      claude-desktop
-      daisydisk
-      github-desktop
-      gitify
-      iina
-      m-cli
-      mas
-      mochi
-      slack
-      soundsource
-      the-unarchiver
-      whatsapp-for-mac
-      zoom-us
-    ];
   in
     development
     ++ nixSpecific
     ++ tuiApps
     ++ utilities
-    ++ lib.optionals enableGuiPackages guiApps
-    ++ lib.optionals stdenv.isDarwin darwinApps;
+    ++ lib.optionals enableGuiPackages guiApps;
   home.sessionPath = [
     "$HOME/.local/bin"
   ];

hosts/Rhizome/default.nix

@@ -6,5 +6,13 @@
   imports = [
     ./dock.nix
     ./hardware.nix
+    ./programs.nix
   ];
+
+  rc.darwin.defaults = {
+    fonts = true;
+    homebrew = true;
+    security = true;
+    system = true;
+  };
 }

hosts/Rhizome/programs.nix

@@ -0,0 +1,91 @@
+{
+  config,
+  pkgs,
+  ...
+}: {
+  homebrew = {
+    enable = true;
+    casks = [
+      "legcord"
+      "plex"
+      "textual"
+    ];
+    # N.B.: Removed entries in `masApps` require manual uninstallation
+    masApps = {
+      "Copilot" = 1447330651;
+      "Folder Quick Look" = 6753110395;
+      "GoodLinks" = 1474335294;
+      "Hand Mirror" = 1502839586;
+      "Hush" = 1544743900;
+      "Mapper" = 1589391989;
+      "Mela" = 1568924476;
+      "MusicBox" = 1614730313;
+      "Numbers" = 409203825;
+      "Noir" = 1592917505;
+      "Pages" = 409201541;
+      "Paku" = 1534130193;
+      "Parcel" = 375589283;
+      "Pixea" = 1507782672;
+      "Play" = 1596506190;
+      "Prompt" = 1594420480;
+      "Reeder" = 1529448980;
+      "Timery" = 1425368544;
+      "Things" = 904280696;
+      "Wipr" = 1320666476;
+    };
+  };
+
+  programs.craft = {
+    enable = true;
+  };
+
+  programs.daisydisk = {
+    enable = true;
+  };
+
+  programs.fastscripts = {
+    enable = true;
+    startOnActivation = true;
+  };
+  rc.darwin.defaults.fastscripts = true;
+
+  programs.iina = {
+    enable = true;
+  };
+
+  programs.little-snitch = {
+    enable = true;
+  };
+
+  programs.nova-editor = {
+    enable = true;
+  };
+
+  programs.popclip = {
+    enable = true;
+    startOnActivation = true;
+  };
+
+  programs.postico = {
+    enable = true;
+  };
+
+  programs.roon = {
+    enable = true;
+  };
+
+  programs.scroll-reverser = {
+    enable = true;
+    startOnActivation = true;
+  };
+
+  programs.soundsource = {
+    enable = true;
+    startOnActivation = true;
+  };
+
+  programs.tailscale = {
+    enable = true;
+    startOnActivation = true;
+  };
+}

modules/darwin/default.nix

@@ -3,86 +3,21 @@
   config,
   pkgs,
   lib,
+  username,
   ...
 }: {
   imports = [
-    ./disable-updates.nix
-    ./fastscripts.nix
-    ./fonts.nix
-    ./homebrew.nix
-    ./popclip.nix
-    ./scroll-reverser.nix
-    ./security.nix
-    ./start-on-activation.nix
-    ./startup-apps.nix
-    ./system-defaults.nix
+    ./programs
+    ./system
+    ./rc.nix
   ];
 
-  programs.fastscripts = {
-    enable = true;
-    userScripts = {
-      SafariQuitWithConfirmation = {
-        source = pkgs.writeText "safari-quit-with-confirmation.applescript" (builtins.readFile ./fastscripts/safari-quit-with-confirmation.applescript);
-        target = "Applications/Safari/Quit With Confirmation.applescript";
-      };
-    };
-    plistFile = pkgs.writeText "fastscripts-keybindings.plist" (builtins.readFile ./fastscripts/keybindings.plist);
-  };
-
-  # TODO: Ideally this would be in a Darwin-specific home-manager module
-  programs.popclip = {
-    enable = true;
-  };
-
-  programs.scroll-reverser = {
-    enable = true;
+  home-manager.users.${username} = {...}: {
+    imports = [./home.nix];
   };
 
   system.configurationRevision = self.rev or self.dirtyRev or null;
 
-  # TODO: Keyboard shortcuts, see nix-darwin/nix-darwin#699
-  # system.keyboard.shortcuts = let
-  #   cmdOptLeft = {
-  #     mods = {
-  #       option = true;
-  #       command = true;
-  #     };
-  #     key = "left";
-  #   };
-  #   cmdOptRight = {
-  #     mods = {
-  #       option = true;
-  #       command = true;
-  #     };
-  #     key = "right";
-  #   };
-  # in {
-  #   enable = true;
-  #   appShortcuts = {
-  #     "Preview.app" = {
-  #       "Show Previous Tab" = cmdOptLeft;
-  #       "Show Next Tab" = cmdOptRight
-  #     };
-  #     "Finder.app" = {
-  #       "Show Previous Tab" = cmdOptLeft;
-  #       "Show Next Tab" = cmdOptRight
-  #     };
-  #     "Prompt.app" = {
-  #       "Show Previous Tab" = cmdOptLeft;
-  #       "Show Next Tab" = cmdOptRight
-  #     };
-  #     "Mail.app" = {
-  #       "Archive" = {
-  #         key = "right";
-  #       };
-  #     };
-  #     "Nova.app" = {
-  #       "Show Previous Tab" = cmdOptLeft;
-  #       "Show Next Tab" = cmdOptRight
-  #     };
-  #   };
-  # };
-
   # Auto upgrade nix package and the daemon service.
   nix.enable = true;
   nix.package = pkgs.nix;

modules/darwin/home.nix

@@ -0,0 +1,21 @@
+{
+  self,
+  config,
+  pkgs,
+  lib,
+  ...
+}: {
+  home.packages = with pkgs; [
+    chatgpt
+    claude-desktop
+    github-desktop
+    gitify
+    m-cli
+    mas
+    mochi
+    slack
+    the-unarchiver
+    whatsapp-for-mac
+    zoom-us
+  ];
+}

modules/darwin/programs/craft.nix

@@ -0,0 +1,28 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib; let
+  cfg = config.programs.craft;
+in {
+  options.programs.craft = {
+    enable = mkEnableOption "Craft";
+
+    startOnActivation = mkEnableOption "starting Craft on activation";
+  };
+
+  config = mkIf cfg.enable {
+    homebrew.casks = [
+      {
+        name = "craft";
+        greedy = true;
+      }
+    ];
+    system.disableUpdates = ["com.lukilabs.lukiapp"];
+    system.startOnActivation = mkIf cfg.startOnActivation {
+      "Craft" = "/Applications/Craft.app/";
+    };
+  };
+}