Update README.md

Reviewed-on: #1

.gitignore

@@ -0,0 +1 @@
+result

README.md

@@ -1,15 +1,33 @@
 # My nix-darwin Configuration
 This repo is meant to be a declarative setup for new macOS devices, specifically focused on the application installs. All GUI applications will be handled by homebrew and some brews or CLI tools. The more stable and maintained CLI tools are installed via nixpkgs.
 
+This config contains options for both personal user and work use. There are shared packages found in [modules/apps](./modules/apps.nix) along with "profile" specific packages in their respective directories [profiles/personal](./profiles/personal/) and [profiles/work](./profiles/work/).
+
+> [!important]
+> Ignore the `install.sh` file for now, it's out dated and I don't believe will work in the current state.
+> I'll think about adding a new install script but the default installation by cloning the repo into `/etc/nix-darwin` works pretty good.
+
 ## Installation
-1. Clone this repo onto the machine (probably fastest via usb) or install `git` seperatly and run `git clone https://git.briannelson.dev/brian/nix-darwin.git`
+1. Have an implementation of nix installed [nixos.org](https://nixos.org/download/)
-2. `cd` into the repo
+2. Clone this repo onto the machine (probably fastest via usb) or install `git` seperatly and run `git clone https://git.briannelson.dev/brian/nix-darwin.git`
-3. Run `./install.sh` this will run a bash script that handles all of the installation of nix, file renaming and copying the files to the correct directory.
+3. Copy the repo into `/etc/nix-darwin` 
+```bash
+sudo mkdir -p /etc/nix-darwin
+sudo chown $(id -nu):$(id -ng) /etc/nix-darwin
+sudo cp [PATH/TO/REPO] /etc/nix-darwin
+```
+4. Install nix-darwin and the profile you want with
+```bash
+sudo nix run nix-darwin/nix-darwin-26.05#darwin-rebuild --extra-experimental-features "nix-command flakes" -- switch --flake "/etc/nix-darwin#PROFILE_NAME"
+# where PROFILE_NAME is either personal or work
+```
+5. Maintianing nix-darwin if any changes get made locally you can run the rebuild switch command. If changes get made remotely make sure to run `git pull` then the rebuild switch command.
+```bash
+cd /etc/nix-darwin
 
+git pull
+
+sudo darwin-rebuild switch --flake ".#PROFILE"
+```
 ## Homebrew
-I like using homebrew as my package manager for most apps as its really easy and convienent to run `brew upgrade` to update all apps in 1 go. I love nix for many other reasons but some of the packages on the stable branch aren't always up-to-date and take a while to update.
+I like using homebrew as my package manager for most apps as its really easy and convienent to run `brew upgrade` to update all apps in 1 go. I love nix for many other reasons but some of the packages on the stable branch aren't always up-to-date and take a while to update.
-
-## Future Options
-I like the option of setting the dock up using some of the options in nix-darwin but only on initial build. I found that getting the macOS machine setup with nix-darwin and setting all the dock apps was cool but if you made changes to to dock for whatever reason (installing a new app, having a different prefernce, etc.), rebuilding the system would then set the dock back to the original option.
-
-I think that the use of Homebrew can help with this a little bit in the sense that I can update most apps without having to rebuild the system. So making changes to the dock via the "normal" click and drag on macOS can stay persistent for the most part but remembering to set the change in the config will be important for rebuilds.

cli-tools.nix

@@ -1,47 +0,0 @@
-{ inputs, pkgs, ... }:
-
-let
-  cupsadminPkg = pkgs.fetchurl {
-    url = "https://github.com/kfattic/cupsadmin/releases/download/v1.4.1/cupsadmin-1.4.1.pkg";
-    hash = "sha256-DyIyDYSjAlcU7ivyfldMapIZw5nczEBXfnLicnK6k7Y=";
-  };
-in
-
-{
-  system.activationScripts.postActivation.text = ''
-    want="${cupsadminPkg}"
-    stamp=/usr/local/share/cupsadmin-pkg.stamp
-    if [ "$(cat "$stamp" 2>/dev/null)" != "$want" ]; then
-      echo "installing cupsadmin..."
-      if /usr/sbin/installer -pkg "$want" -target /; then
-        mkdir -p /usr/local/share
-        echo "$want" > "$stamp"
-      else
-        echo "cupsadmin install failed, skipping"
-      fi
-    fi
-  '';
-
-  environment.shellAliases = {
-    yt = "yt-dlp";
-    ll = "ls -la";
-  };
-
-  environment.etc."gitconfig".text = ''
-    [user]
-      name = Brian Nelson
-      email = brian@briannelson.dev
-    [init]
-      defaultBranch = main
-  '';
-
-  environment.etc."yt-dlp.conf".text = ''
-    -o /Users/briannelson/Downloads/yt-dlp/%(title)s.%(ext)s
-    --no-mtime
-    --restrict-filenames
-    --embed-thumbnails
-    --embed-metadata
-    --format "bestvideo[height<=1080]+bestaudio/best[height<=1080]"
-    --merge-output-format mp4
-  '';
-}

configuration.nix

@@ -1,70 +0,0 @@
-{ config, pkgs, ... }: 
-
-{
-  imports = [
-    ./cli-tools.nix
-    ./mac-settings.nix
-  ];
-
-  nixpkgs.hostPlatform = "aarch64-darwin";
-
-  nixpkgs.config.problems.handlers = {
-    live555.broken = "warn";
-  };
-
-  nix.enable = false;
-
-  nix.settings.experimental-features = "nix-command flakes";
-
-  nixpkgs.config.allowUnsupportedSystem = true;
-
-  system.stateVersion = 6;
-  system.primaryUser = "briannelson";
-
-  environment.systemPackages = with pkgs; [
-    exif
-    exiftool
-    ffmpeg
-    flac
-    git
-    helix
-    librewolf
-    nicotine-plus
-    tea
-    yt-dlp
-  ];
-
-  homebrew = {
-    enable = true;
-    onActivation = {
-      autoUpdate = true;
-      cleanup = "none";
-    };
-
-    brews = [
-      "bun"
-      "harper"
-      "rust"
-      "ykman"
-    ];
-
-    casks = [
-      "bitwarden"
-      "cap"
-      "discord"
-      "docker-desktop"
-      "harper-desktop"
-      "libreoffice"
-      "nextcloud"
-      "obsidian"
-      "protonvpn"
-      "rustdesk"
-      "signal"
-      "task-manager-tmog"
-      "twingate"
-      "vlc"
-      "vscodium"
-      "firefox"
-    ];
-  };
-}

flake.lock

@@ -0,0 +1,106 @@
+{
+  "nodes": {
+    "brew-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1793000687,
+        "narHash": "sha256-8mCor0DDjNhi+0e+FllfqiMABujBl+/RxYW+wgMpcto=",
+        "owner": "Homebrew",
+        "repo": "brew",
+        "rev": "c6069d2a943b71b0a90d91fc1ac93cb9c1634dcc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Homebrew",
+        "ref": "7.0.11",
+        "repo": "brew",
+        "type": "github"
+      }
+    },
+    "nix-darwin": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1792800221,
+        "narHash": "sha256-53jIZEWNh96irEXhsMZFoNhLJgGSU3nYl1i4wFQHAsU=",
+        "owner": "nix-darwin",
+        "repo": "nix-darwin",
+        "rev": "d31953cf55f9027a56e9be938daf5db8c5655663",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-darwin",
+        "ref": "nix-darwin-26.05",
+        "repo": "nix-darwin",
+        "type": "github"
+      }
+    },
+    "nix-homebrew": {
+      "inputs": {
+        "brew-src": "brew-src"
+      },
+      "locked": {
+        "lastModified": 1793543863,
+        "narHash": "sha256-oDYLVD8KGT/M57c8HziYSSj0le4wCyA+jZ7+/qUS91M=",
+        "owner": "zhaofengli",
+        "repo": "nix-homebrew",
+        "rev": "52bc87da3f30c2261a6d1cfef3c892097b53daeb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "zhaofengli",
+        "repo": "nix-homebrew",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1793976852,
+        "narHash": "sha256-bWDN3JZcE9ovYoaD0/6WYbMtXYpUu0vd5onpK0pc/SE=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "57f1c8965649ce5bcac5118a0d2e41f1fbdc56e5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-26.05-darwin",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "nix-darwin": "nix-darwin",
+        "nix-homebrew": "nix-homebrew",
+        "nixpkgs": "nixpkgs",
+        "rusty-pw": "rusty-pw"
+      }
+    },
+    "rusty-pw": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1792878430,
+        "narHash": "sha256-SZm2FqJr6tWrDdoEBa1+WUmSQZn514uXulM9opozoQ8=",
+        "ref": "refs/heads/main",
+        "rev": "d8faadac139e0856c6730cf9f5fcc74383362bef",
+        "revCount": 13,
+        "type": "git",
+        "url": "https://git.briannelson.dev/brian/rusty-pw"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.briannelson.dev/brian/rusty-pw"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

flake.nix

@@ -2,32 +2,41 @@
   description = "Brian's macOS nix-darwin configuration";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-26.05-darwin";
-    nix-darwin.url = "github:nix-darwin/nix-darwin";
+    nix-darwin.url = "github:nix-darwin/nix-darwin/nix-darwin-26.05";
     nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
     nix-homebrew.url = "github:zhaofengli/nix-homebrew";
 
-    cupsadmin = {
+    rusty-pw = {
-      url = "github:kfattic/cupsadmin";
+      url = "git+https://git.briannelson.dev/brian/rusty-pw";
-      flake = false;
+      inputs.nixpkgs.follows = "nixpkgs";
     };
   };
 
-  outputs = inputs@{ self, nix-darwin, nixpkgs, nix-homebrew, ... }: {
+  outputs = inputs@{ self, nix-darwin, nixpkgs, nix-homebrew, ... }:
-    darwinConfigurations."Brians-MacBook-Air" = nix-darwin.lib.darwinSystem {
+  let
-      specialArgs = { inherit inputs; };
+    mkDarwin = { profile, user, system ? "aarch-64-dawin" }:
-      modules = [
+      nix-darwin.lib.darwinSystem {
-        ./configuration.nix
+        specialArgs = { inherit inputs user system; };
-        nix-homebrew.darwinModules.nix-homebrew
+        modules = [
-        {
+          ./modules
-          nix-homebrew = {
+          ./profiles/${profile}
-            enable = true;
+          nix-homebrew.darwinModules.nix-homebrew
-            enableRosetta = true;
+          {
-            user = "briannelson";
+            nix-homebrew = {
-            autoMigrate = true;
+              enable = true;
-          };
+              enableRosetta = true;
-        }
+              user = "briannelson";
-      ];
+              autoMigrate = true;
+            };
+          }
+        ];
+      };
+  in
+  {
+    darwinConfigurations = {
+      personal = mkDarwin { profile = "personal"; user = "briannelson"; };
+      work = mkDarwin { profile = "work"; user = "briannelson"; };
     };
   };
-}
+}

modules/apps.nix

@@ -0,0 +1,47 @@
+{ inputs, pkgs, ... }:
+
+{
+  # This file installs these apps on all configurations
+  pkgInstalls = [
+    {
+      name = "cupsadmin";
+      url = "https://github.com/kfattic/cupsadmin/releases/download/v1.4.1/cupsadmin-1.4.1.pkg";
+      hash = "sha256-DyIyDYSjAlcU7ivyfldMapIZw5nczEBXfnLicnK6k7Y=";
+    }
+  ];
+
+  archiveApps = [];
+
+  nixpkgs.overlays = [
+    inputs.rusty-pw.overlays.default
+  ];
+
+  environment.systemPackages = with pkgs; [
+    exif
+    exiftool
+    git
+    helix
+    rusty-pw
+  ];
+
+  homebrew.brews = [
+    "bun"
+    "defaultbrowser"
+    "harper"
+    "rust"
+  ];
+
+  homebrew.casks = [
+    "altersend"
+    "bitwarden"
+    "harper-desktop"
+    "nextcloud"
+    "obsidian"
+    "signal"
+    "task-manager-tmog"
+    "twingate"
+    "vlc"
+    "vscodium"
+    "firefox"
+  ];
+}

modules/archive-installs.nix

@@ -0,0 +1,41 @@
+{ pkgs, lib, config, ... }:
+
+let
+  cfg = config.archiveApps;
+  stampDir = "/usr/local/share/nix-pkg-stamps";
+
+  appScript = a:
+    let
+      src = pkgs.fetchurl { inherit (a) url sha256; };
+    in ''
+      stamp="${stampDir}/${a.name}"
+      want="${src}"
+      if [ "$(cat "$stamp" 2>/dev/null)" != "$want" ]; then
+        echo "installing ${a.name}..."
+        tmp=$(mktemp -d)
+        if /usr/bin/unzip -q "$want" -d "$tmp"; then
+          if [ -d "$tmp/${a.app}" ]; then
+            rm -rf "/Applications/${a.app}"
+            /usr/bin/ditto "$tmp/${a.app}" "/Applications/${a.app}"
+            mkdir -p "${stampDir}"
+            echo "$want" > "$stamp"
+          else
+            echo "${a.name}: ${a.app} not found in zip, skipping"
+          fi
+        else
+          echo "${a.name}: could not unzip, skipping"
+        fi
+        rm -rf "$tmp"
+      fi
+    '';
+in
+{
+  options.archiveApps = lib.mkOption {
+    type = lib.types.listOf (lib.types.attrsOf lib.types.str);
+    default = [ ];
+    description = "Apps distributed as .zip archives to install into /Applications";
+  };
+
+  config.system.activationScripts.postActivation.text =
+    lib.concatMapStringsSep "\n" appScript cfg;
+}

modules/base.nix

@@ -0,0 +1,20 @@
+{ ... }:
+
+{
+  nixpkgs.hostPlatform = "aarch64-darwin";
+
+  nix.settings.experimental-features = "nix-command flakes";
+
+  system.stateVersion = 6;
+  system.primaryUser = "briannelson";
+
+  security.pam.services.sudo_local.touchIdAuth = true;
+
+  homebrew = {
+    enable = true;
+    onActivation = {
+      autoUpdate = true;
+      cleanup = "none";
+    };
+  };
+}

modules/cli-tools.nix

@@ -0,0 +1,20 @@
+{ ... }:
+
+{
+  environment.shellAliases = {
+    ll = "ls -la";
+    nd = "cd /etc/nix-darwin";
+  };
+
+  environment.etc."gitconfig".text = ''
+    [user]
+      name = Brian Nelson
+      email = brian@briannelson.dev
+    [init]
+      defaultBranch = main
+    [credential]
+      helper = osxkeychain
+    '';
+
+  environment.variables.GIT_CONFIG_SYSTEM = "/etc/gitconfig";
+}

modules/default.nix

@@ -0,0 +1,12 @@
+{ ... }:
+
+{
+  imports = [
+    ./base.nix
+    ./apps.nix
+    ./cli-tools.nix
+    ./mac-settings.nix
+    ./pkg-installs.nix
+    ./archive-installs.nix
+  ];
+}

modules/mac-settings.nix

@@ -1,5 +1,4 @@
-# This is a WIP, this file is not yet imported to the config
+{ ... }:
-{ ... }: 
 
 {
   system.defaults = {
@@ -21,29 +20,11 @@
 
     dock = {
       autohide = true;
-      largesize = 40;
+      tilesize = 45;
+      largesize = 85;
       magnification = true;
       mineffect = "scale";
       minimize-to-application = true;
-      # This is all an example of how to set the apps in the Dock. 
-      # The key is to remember to update this before rebuilding.
-      # I may move this item to another file to keep things clean.
-      # persistent-apps = [
-      #   {
-      #     app = "/Applications/Safari.app";
-      #   }
-      #   {
-      #     spacer = {
-      #       small = true;
-      #     };
-      #   }
-      #   {
-      #     folder = "/System/Applications/Utilities";
-      #   }
-      #   {
-      #     file = "/User/example/Downloads/test.csv";
-      #   }
-      # ]
       wvous-br-corner = 11; # Launchpad or Apps
       wvous-tl-corner = 13; # lock screen
     };
@@ -61,5 +42,9 @@
       TrackpadPinch = true;
       TrackpadRightClick = true;
     };
+
+    CustomUserPreferences = {
+      "com.apple.AdLib".allowApplePersonalizedAdvertising = false;
+    };
   };
-}
+}

modules/pkg-installs.nix

@@ -0,0 +1,31 @@
+{ pkgs, lib, config, ... }:
+
+let
+  cfg = config.pkgInstalls;
+  installScript = p:
+    let
+      src = pkgs.fetchurl { inherit (p) url hash; };
+    in ''
+      stamp="/usr/local/share/nix-pkg-stamps/${p.name}"
+      want="${src}"
+      if [ "$(cat "$stamp" 2>/dev/null)" != "$want" ]; then
+        echo "installing ${p.name}..."
+        if /usr/sbin/installer -pkg "$want" -target /; then
+          mkdir -p /usr/local/share/nix-pkg-stamps
+          echo "$want" > "$stamp"
+        else
+          echo "${p.name} install failed, skipping"
+        fi
+      fi
+    '';
+in
+{
+  options.pkgInstalls = lib.mkOption {
+    type = lib.types.listOf (lib.types.attrsOf lib.types.str);
+    default = [ ];
+    description = "PKG files to install on activation";
+  };
+
+  config.system.activationScripts.postActivation.text =
+    lib.concatMapStringsSep "\n" installScript cfg;
+}

profiles/personal/apps.nix

@@ -0,0 +1,38 @@
+{ pkgs, ... }:
+
+{
+  pkgInstalls = [];
+  
+  archiveApps = [
+    {
+      name = "removemacai-app";
+      app = "RemoveMacAI.app";
+      url = "https://github.com/omlahore/RemoveMacAI/releases/download/v1.1.4/RemoveMacAI.zip";
+      sha256 = "2063d4dc7e0b41b15cebcd9e1b9807b04615b96e3e23db35cbd1196be3c96bee";
+    }
+  ];
+
+  environment.systemPackages = with pkgs; [
+    ffmpeg
+    flac
+    fladder
+    librewolf
+    qbittorrent
+    tea
+    yt-dlp
+  ];
+
+  homebrew.brews = [
+    "nicotine-plus"
+  ];
+
+  homebrew.casks = [
+    "cap"
+    "discord"
+    "docker-desktop"
+    "libreoffice"
+    "prismlauncher"
+    "protonvpn"
+    "rustdesk"
+  ];
+}

profiles/personal/cli-tools.nix

@@ -0,0 +1,23 @@
+{ ... }:
+
+{
+  environment.shellAliases = {
+    yt = "yt-dlp";
+  };
+
+  environment.etc."yt-dlp.conf".text = ''
+    -o /Users/briannelson/Downloads/yt-dlp/%(title)s.%(ext)s
+    --no-mtime
+    --restrict-filenames
+    --embed-thumbnail
+    --embed-metadata
+    --format "bestvideo[height<=1080]+bestaudio/best[height<=1080]"
+    --merge-output-format mp4
+  '';
+
+  system.activationScripts.postActivation.text = ''
+    if [ -x /opt/homebrew/bin/defaultbrowser ]; then
+      sudo -u briannelson /opt/homebrew/bin/defaultbrowser librewolf || echo "could not set deffault browser, skipping"
+    fi
+  '';
+}

profiles/personal/default.nix

@@ -0,0 +1,28 @@
+{ ... }:
+
+{
+  imports = [
+    ./cli-tools.nix
+    ./apps.nix
+  ];
+
+  system.defaults.dock = {
+    persistent-apps = [
+      { app = "/System/Applications/Apps.app"; }    
+      { app = "/Applications/Nix Apps/LibreWolf.app"; }
+      { app = "/System/Applications/Utilities/Terminal.app"; }
+      { app = "/System/Applications/Messages.app"; }
+      { app = "/Applications/Obsidian.app"; }
+      { app = "/Applications/VSCodium.app"; }
+      { app = "/System/Applications/Maps.app"; }
+      { app = "/System/Applications/Calendar.app"; }
+      { app = "/System/Applications/Reminders.app"; }
+      { app = "/Applications/Bitwarden.app"; }
+      { app = "/Applications/ProtonVPN.app"; }
+      { app = "/Applications/Nix Apps/Fladder.app"; }
+      { app = "/System/Applications/App Store.app"; }
+      { app = "/Applications/AlterSend.app"; }
+      { app = "/System/Applications/System Settings.app"; } 
+     ];
+  };
+}

profiles/work/apps.nix

@@ -0,0 +1,19 @@
+{ pkgs, ... }:
+
+{
+  pkgInstalls = [];
+  
+  archiveApps = [];
+  
+  environment.systemPackages = with pkgs; [];
+
+  homebrew.brews = [
+    "ykman"
+  ];
+
+  homebrew.casks = [
+    "1Password"
+    # I would add google chrome but that will be installed by Mosyle
+    # "google-chrome"
+  ];
+}

profiles/work/cli-tools.nix

@@ -0,0 +1,9 @@
+{ ... }:
+
+{
+  system.activationScripts.postActivation.text = ''
+    if [ -x /opt/homebrew/bin/defaultbrowser ]; then
+      sudo -u briannelson /opt/homebrew/bin/defaultbrowser firefox || echo "could not set deffault browser, skipping"
+    fi
+  '';
+}

profiles/work/default.nix

@@ -0,0 +1,24 @@
+{ ... }:
+
+{
+  imports = [
+    ./apps.nix
+    ./cli-tools.nix
+  ];
+
+  system.defaults.dock = {
+    persistent-apps = [
+      { app = "/System/Applications/Apps.app"; }
+      { app = "/Applications/Firefox.app"; }
+      { app = "/System/Applications/Utilities/Terminal.app"; }
+      { app = "/Applications/Obsidian.app"; }
+      { app = "/Applications/VSCodium.app"; }
+      { app = "/System/Applications/App Store.app"; }
+      { app = "/Applications/1Password.app"; }
+      { app = "/Applications/Manager.app"; }
+      { app = "/Applications/CUPS Admin.app"; }
+      { app = "/Applications/AlterSend.app"; }
+      { app = "/System/Applications/System Settings.app"; }  
+    ];
+  };
+}