Update README.md

Reviewed-on: #1

.gitignore

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

README.md

@@ -0,0 +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. Have an implementation of nix installed [nixos.org](https://nixos.org/download/)
+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. 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.

configuration.nix

@@ -1,65 +0,0 @@
-{ pkgs, ... }:
-
-{
-  imports = [
-    ./cli-tools.nix
-    ./mac-settings.nix
-    ./pkg-installs.nix
-    ./archive-installs.nix
-  ];
-  
-  nixpkgs.hostPlatform = "aarch64-darwin";
-
-  nix.settings.experimental-features = "nix-command flakes";
-
-  system.stateVersion = 6;
-  system.primaryUser = "briannelson";
-
-  environment.systemPackages = with pkgs; [
-    exif
-    exiftool
-    ffmpeg
-    flac
-    git
-    helix
-    librewolf
-    tea
-    yt-dlp
-  ];
-
-  homebrew = {
-    enable = true;
-    onActivation = {
-      autoUpdate = true;
-      cleanup = "none";
-    };
-
-    brews = [
-      "bun"
-      "defaultbrowser"
-      "harper"
-      "nicotine-plus"
-      "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

@@ -76,7 +76,28 @@
       "inputs": {
         "nix-darwin": "nix-darwin",
         "nix-homebrew": "nix-homebrew",
-        "nixpkgs": "nixpkgs"
+        "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"
       }
     }
   },

flake.nix

@@ -6,21 +6,37 @@
     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";
+
+    rusty-pw = {
+      url = "git+https://git.briannelson.dev/brian/rusty-pw";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
-  outputs = inputs@{ self, nix-darwin, nixpkgs, nix-homebrew, ... }: {
-    darwinConfigurations."Brians-MacBook-Air" = nix-darwin.lib.darwinSystem {
-      modules = [ 
-        ./configuration.nix
-        nix-homebrew.darwinModules.nix-homebrew
-        {
-          nix-homebrew = {
-            enable = true;
-            enableRosetta = true;
-            user = "briannelson";
-          };
-        }
-      ];
+  outputs = inputs@{ self, nix-darwin, nixpkgs, nix-homebrew, ... }:
+  let
+    mkDarwin = { profile, user, system ? "aarch-64-dawin" }:
+      nix-darwin.lib.darwinSystem {
+        specialArgs = { inherit inputs user system; };
+        modules = [
+          ./modules
+          ./profiles/${profile}
+          nix-homebrew.darwinModules.nix-homebrew
+          {
+            nix-homebrew = {
+              enable = true;
+              enableRosetta = true;
+              user = "briannelson";
+              autoMigrate = true;
+            };
+          }
+        ];
+      };
+  in
+  {
+    darwinConfigurations = {
+      personal = mkDarwin { profile = "personal"; user = "briannelson"; };
+      work = mkDarwin { profile = "work"; user = "briannelson"; };
     };
   };
 }

install.sh

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+echo "==> Checking for Nix..."
+if ! command -v nix >/dev/null 2>&1; then
+    echo "==> Installing Nix vis Determinate Systems installer..."
+    curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix | sh -s -- install
+    . /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
+else
+    echo "Nix already installed, skipping."
+fi
+
+echo "==> Copying config to /etc/nix-darwin..."
+sudo mkdir -p /etc/nix-darwin
+sudo cp -r "$(pwd)/." /etc/nix-darwin
+sudo chown -R root:wheel /etc/nix-darwin
+
+echo "==> Renaming conflicting shell files if present..."
+[ -f /etc/bashrc ] && sudo mv /etc/bashrc /etc/bashrc.before-nix-darwin
+[ -f /etc/zshrc ] && sudo mv /etc/zshrc /etc/zshrc.before-nix-darwin
+[ -f /etc/zshenv ] && sudo mv /etc/zshenv /etc/zshenv.before-nix-darwin
+
+echo "==> Bootstraping nix-darwin..."
+nix run nix-darwin/master#darwin-rebuild -- switch --flake /etc/nix-darwin
+
+echo "==> Done! Restart your terminal to apply all changes."

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

@@ -1,17 +1,9 @@
-{ pkgs, lib, ... }:
+{ pkgs, lib, config, ... }:
 
 let
+  cfg = config.archiveApps;
   stampDir = "/usr/local/share/nix-pkg-stamps";
 
-  apps = [
-    {
-      name = "removemacai-app";
-      app = "RemoveMacAI.app";
-      url = "https://github.com/omlahore/RemoveMacAI/releases/download/v1.1.4/RemoveMacAI.zip";
-      sha256 = "2063d4dc7e0b41b15cebcd9e1b9807b04615b96e3e23db35cbd1196be3c96bee";
-    }
-  ];
-
   appScript = a:
     let
       src = pkgs.fetchurl { inherit (a) url sha256; };
@@ -38,8 +30,12 @@ let
     '';
 in
 {
-  system.activationScripts.postActivation.text =
-    lib.concatStringsSep "\n" (
-      (map appScript apps)
-    );
+  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

@@ -20,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
     };
@@ -60,5 +42,9 @@
       TrackpadPinch = true;
       TrackpadRightClick = true;
     };
+
+    CustomUserPreferences = {
+      "com.apple.AdLib".allowApplePersonalizedAdvertising = false;
+    };
   };
 }

modules/pkg-installs.nix

@@ -1,15 +1,7 @@
-{ pkgs, lib, ... }:
+{ pkgs, lib, config, ... }:
 
 let
-  # Add one entry per program you want to install from a .pkg file
-  pkgInstalls = [
-    {
-      name = "cupsadmin";
-      url = "https://github.com/kfattic/cupsadmin/releases/download/v1.4.1/cupsadmin-1.4.1.pkg";
-      hash = "sha256-DyIyDYSjAlcU7ivyfldMapIZw5nczEBXfnLicnK6k7Y=";
-    }
-  ];
-
+  cfg = config.pkgInstalls;
   installScript = p:
     let
       src = pkgs.fetchurl { inherit (p) url hash; };
@@ -28,6 +20,12 @@ let
     '';
 in
 {
-  system.activationScripts.postActivation.text =
-    lib.concatMapStringsSep "\n" installScript pkgInstalls;
+  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

@@ -1,19 +1,10 @@
-{ pkgs, ... }:
+{ ... }:
 
 {
   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

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"; }  
+    ];
+  };
+}