chore: modularize flake (#11)

* moduralize darwin

* Normalize host layout

* Introduce profiles for organization

* Remove duplicate allowUnfree

* Remove duplicate

* Disable ollama service

* Made host font overrides additive

* Add devShell and formatter

* Enable CI on PRs

* PR Feedback (Round 1)

* PR Feedback (Round 2)

* Remove comment

* Another pesky leftover comment

* run CI lint on linux runners

* Fix formatting d3rp

* remove nil lsp

* DRY devShells

* Add deadnix to lint job

* Fix another d3rp

Author: csamuel

.envrc

@@ -0,0 +1,7 @@
+# If we are a computer with nix-shell available, then use that to setup
+# the build environment with exactly what we need.
+if has nix; then
+  use flake
+fi
+
+source_env_if_exists .envrc.local

.github/workflows/ci.yml

@@ -0,0 +1,51 @@
+name: CI
+
+on:
+  pull_request:
+
+permissions:
+  contents: read
+
+concurrency:
+  group: ci-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  lint:
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v4
+      - uses: DeterminateSystems/nix-installer-action@v19
+      - uses: DeterminateSystems/magic-nix-cache-action@v13
+      - name: Check formatting
+        run: nix develop -c treefmt --ci
+      - name: Deadnix (fail on unused Nix)
+        run: nix run nixpkgs#deadnix -- --fail
+
+  flake-check:
+    runs-on: macos-15
+    needs: lint
+    steps:
+      - uses: actions/checkout@v4
+      - uses: DeterminateSystems/nix-installer-action@v19
+      - uses: DeterminateSystems/magic-nix-cache-action@v13
+      - name: Show flake outputs
+        run: nix flake show
+      - name: Flake checks (no system builds)
+        run: nix flake check --keep-going --print-build-logs
+
+  eval-hosts:
+    runs-on: macos-15
+    needs: flake-check
+    strategy:
+      fail-fast: false
+      matrix:
+        host: [higgins, benson, spaceblack, dunston]
+    steps:
+      - uses: actions/checkout@v4
+      - uses: DeterminateSystems/nix-installer-action@v19
+      - uses: DeterminateSystems/magic-nix-cache-action@v13
+      - name: Evaluate toplevel drv for ${{ matrix.host }}
+        run: nix eval --raw .#darwinConfigurations.${{ matrix.host }}.config.system.build.toplevel.drvPath
+
+

darwin/audio.nix

@@ -1,6 +1,6 @@
-{ ... }:
+{ lib, config, ... }:
 
-{
+lib.mkIf config.profiles.audio.enable {
   homebrew = {
     casks = [
       "ableton-live-suite"

darwin/darwin.nix

@@ -1,287 +1,17 @@
-{ pkgs, user, ... }:
+{ ... }:
 
 {
-  system.primaryUser = user;
-
-  nixpkgs.config.allowUnfree = true;
-
-  # Since we are using determinate nix distribution
-  nix.enable = false;
-
-  programs = {
-    gnupg.agent.enable = true;
-    zsh.enable = true;
-  };
-
-  system.stateVersion = 4;
-
-  environment.systemPackages = with pkgs; [
-    asitop
-    autoconf
-    autoconf-archive
-    automake
-    aws-nuke
-    aws-iam-authenticator
-    awscli2
-    btop
-    cmake
-    ccache
-    cocoapods
-    deno
-    direnv
-    doctl
-    doggo
-    duckdb
-    duf
-    dust
-    eksctl
-    emacs
-    fastfetch
-    fd
-    ffmpeg
-    foreman
-    fzf
-    gh
-    glab
-    gnupg
-    go
-    google-cloud-sdk
-    k9s
-    kubernetes-helm
-    heroku
-    home-manager
-    htop
-    iftop
-    iperf3
-    jq
-    kind
-    lolcat
-    neovim
-    minikube
-    nasm
-    netcat
-    ninja
-    pinentry_mac
-    podman
-    pkg-config
-    python313
-    ripgrep
-    rbenv
-    qemu
-    sesh
-    sketchybar
-    sketchybar-app-font
-    socat
-    terraform
-    tmux
-    ugrep
-    unzip
-    uv
-    vim
-    watchman
-    yarn
-    zellij
-    zoxide
+  imports = [
+    ./modules/base.nix
+    ./modules/packages.nix
+    ./modules/fonts.nix
+    ./modules/homebrew.nix
+    ./modules/defaults.nix
+    ./modules/activation.nix
+    ./modules/profiles.nix
+    ./audio.nix
+    ./gaming.nix
+    ./photography.nix
+    ./video.nix
   ];
-
-  fonts.packages = with pkgs; [
-    atkinson-hyperlegible
-    jetbrains-mono
-  ];
-
-  homebrew = {
-    enable = true;
-    onActivation = {
-      autoUpdate = true;
-      cleanup = "zap";
-      upgrade = true;
-    };
-    brews = [
-      "gemini-cli"
-      "pulumi"
-      "nvm"
-      "sst/tap/sst"
-      "sst/tap/opencode"
-    ];
-    casks = [
-      "1password"
-      "1password-cli"
-      "alcove"
-      "affinity-photo"
-      "android-file-transfer"
-      "balenaetcher"
-      "bartender"
-      "betterdisplay"
-      "bitwarden"
-      "claude"
-      "cleanshot"
-      "crystalfetch"
-      "cursor"
-      "discord"
-      "docker-desktop"
-      "dropbox"
-      "elgato-stream-deck"
-      "expo-orbit"
-      "figma"
-      "firefox"
-      "flirc"
-      "font-bitstream-vera-sans-mono-nerd-font"
-      "font-hack-nerd-font"
-      "font-meslo-lg-nerd-font"
-      "ghostty"
-      "gitkraken-cli"
-      "google-chrome"
-      "granola"
-      "iina"
-      "inkscape"
-      "istat-menus"
-      "kiro"
-      "legcord"
-      "linear-linear"
-      "lm-studio"
-      "miro"
-      "monarch"
-      "notion"
-      "notion-calendar"
-      "ngrok"
-      "orion"
-      "onyx"
-      "orbstack"
-      "pgadmin4"
-      "postman"
-      "raycast"
-      "reactotron"
-      "rectangle-pro"
-      "setapp"
-      "signal"
-      "slack"
-      "sloth"
-      "spotify"
-      "ssh-config-editor"
-      "syncthing-app"
-      "the-unarchiver"
-      "tidal"
-      "tower"
-      "transmission"
-      "visual-studio-code"
-      "vlc"
-      "wifiman"
-      "xrg"
-      "zed"
-      "zoom"
-    ];
-    taps = [
-      "azure/functions"
-      "homebrew/test-bot"
-      "sst/tap"
-      "FelixKratz/formulae"
-    ];
-    masApps = {
-      "DaisyDisk" = 411643860;
-      "Hyperspace" = 6739505345;
-      "Ice Cubes" = 6444915884;
-      "Ivory" = 6444602274;
-      "Keka" = 470158793;
-      "MediaInfo" = 510620098;
-      "Okta Verify" = 490179405;
-      "Parcel" = 639968404;
-      "Photomator" = 1444636541;
-      "Pixelmator Pro" = 1289583905;
-      "Prime Video" = 545519333;
-      "Raw Convertor" = 1598580439;
-      "Screens 5" = 1663047912;
-      "Tailscale" = 1475387142;
-      "WireGuard" = 1451685025;
-      "Xcode" = 497799835;
-    };
-  };
-
-  system.defaults = {
-    NSGlobalDomain = {
-      AppleInterfaceStyle = "Dark";
-      NSWindowShouldDragOnGesture = true;
-      NSAutomaticSpellingCorrectionEnabled = false;
-      NSAutomaticQuoteSubstitutionEnabled = false;
-      NSAutomaticDashSubstitutionEnabled = false;
-      NSAutomaticCapitalizationEnabled = false;
-      InitialKeyRepeat = 20;
-      KeyRepeat = 1;
-      AppleShowAllExtensions = true;
-      "com.apple.springing.enabled" = true;
-      "com.apple.springing.delay" = 0.1;
-      "com.apple.swipescrolldirection" = false;
-    };
-
-    screencapture = {
-      location = "~/Downloads";
-      type = "png";
-      disable-shadow = true;
-    };
-
-    finder = {
-      CreateDesktop = false;
-      QuitMenuItem = true;
-      _FXShowPosixPathInTitle = true;
-      FXEnableExtensionChangeWarning = false;
-      FXPreferredViewStyle = "Nlsv";
-      ShowExternalHardDrivesOnDesktop = false;
-      ShowHardDrivesOnDesktop = false;
-      ShowMountedServersOnDesktop = false;
-      ShowRemovableMediaOnDesktop = false;
-      ShowStatusBar = true;
-      # Current Folder
-      FXDefaultSearchScope = "SCcf";
-      NewWindowTarget = "Other";
-      NewWindowTargetPath = "file://${builtins.getEnv "HOME"}";
-    };
-
-    dock = {
-      autohide = true;
-      show-recents = false;
-      expose-animation-duration = 0.15;
-      orientation = "left";
-      tilesize = 32;
-      magnification = true;
-      largesize = 64;
-    };
-
-    ActivityMonitor = {
-      OpenMainWindow = true;
-      # All Processes
-      ShowCategory = 100;
-      SortColumn = "CPUUsage";
-      # Descending
-      SortDirection = 0;
-    };
-
-    CustomUserPreferences = {
-      "com.apple.desktopservices" = {
-        # Avoid creating .DS_Store files on network or USB volumes
-        DSDontWriteNetworkStores = true;
-        DSDontWriteUSBStores = true;
-      };
-      "com.apple.TimeMachine".DoNotOfferNewDisksForBackup = true;
-      # Prevent Photos from opening automatically when devices are plugged in
-      "com.apple.ImageCapture".disableHotPlug = true;
-      # Turn on app auto-update
-      "com.apple.commerce".AutoUpdate = true;
-    };
-  };
-
-  # Disable skhd for now
-  # services.skhd = {
-  #   enable = true;
-  #   skhdConfig = ''
-  #     cmd - return : open --new -a ghostty.app
-  #   '';
-  # };
-
-  system.activationScripts.extraActivation.text = ''
-    # Show Library folder
-    chflags nohidden ~/Library
-
-    # TODO: Disable until I can determine why this inverts natural scrolling option
-    # Following line should allow us to avoid a logout/login cycle to see changes
-    # /System/Library/PrivateFrameworks/SystemAdministration.framework/Resources/activateSettings -u
-  '';
 }

darwin/gaming.nix

@@ -1,6 +1,6 @@
-{ ... }:
+{ lib, config, ... }:
 
-{
+lib.mkIf config.profiles.gaming.enable {
   homebrew = {
     casks = [
       "crossover"

darwin/hosts/benson.nix

@@ -0,0 +1,10 @@
+{ ... }:
+
+{
+  profiles = {
+    audio.enable = true;
+    gaming.enable = true;
+    photography.enable = true;
+    video.enable = true;
+  };
+}