add directions for darwin bootstrap

flake.nix

@@ -112,7 +112,7 @@
       };
     };
     darwinConfigurations = {
-      cen-it-07 = nix-darwin.lib.darwinSystem {
+      CEN-IT-07 = nix-darwin.lib.darwinSystem {
         system = systems.darwin;
         specialArgs = {inherit inputs stable_pkgs unstable_pkgs nix-homebrew;};
         modules = [

hosts/darwin/cen-it-07/configuration.nix

@@ -23,6 +23,17 @@
   };
  
 
+  # since darwin needs root now (will be removed in future)
+  system.primaryUser = "bhelderman"
+  
+  power = {
+    sleep = {
+      computer = 30;
+      display = 5;
+      allowSleepByPowerButton = true;
+    };
+  };
+
   # import home grown host specific home-manager modules
   home-manager.users.bhelderman.imports = [
     ../../../users/blake/hosts/cen-it-07.nix
@@ -50,18 +61,14 @@
   nix-homebrew = {
     enable = true;  # install homebrew
     enableRosetta = true;   # install homebrew for rosetta as well
-#    autoMigrate = true;
+    autoMigrate = true;
     user = "bhelderman";  # user owning homebrew prefix
   };
 
   homebrew = {
     enable = true;
     # removes anything in homebrew not explicitly specified
-    onActivation = {
-      cleanup = "uninstall";
-      autoUpdate = true;
-      upgrade = false;
-    };
+    #onActivation.cleanup = "uninstall";
 
     brews = [
       "mas"
@@ -80,31 +87,7 @@
       "testflight" = 899247664;
     };
   };
-  # for mas to not throw rebuild fit
-  system.activationScripts.masFix.text = ''
-    if command -v mas >/dev/null; then
-      for app in ${toString (map (id: builtins.toString id) (builtins.attrValues config.homebrew.masApps))}; do
-        if mas list | grep -q "$app"; then
-          echo "mas app $app already installed, skipping"
-        else
-          mas install "$app"
-        fi
-      done
-    fi
-  '';
-
-  # since darwin needs root now (will be removed in future)
-  system.primaryUser = "bhelderman";
-
-  power = {
-    sleep = {
-      computer = 30;
-      display = 5;
-      allowSleepByPowerButton = true;
-    };
-  };
-
-
 
+  system.stateVersion = 6;
 
 }

hosts/darwin/default.nix

@@ -9,65 +9,16 @@
 /*
 instructions for first time setup for macos here
 1. install the nix package manager with: `sh <(curl --proto '=https' --tlsv1.2 -L https://nixos.org/nix/install)`
-2. install xcode tools with `xcode-select --install`
-3. allow full disk access to terminal
-4. xfer or git clone flake to ~/.nix
-5. sign into icloud and by extension app store for mas 
-6. rename some shell rc files with `sudo mv /etc/bashrc /etc/bashrc.before-nix-darwin && sudo mv /etc/zshrc /etc/zshrc.before-nix-darwin`
-7. install nix-darwin with: `nix run --extra-experimental-features "nix-command flakes" nix-darwin -- switch --flake ~/.nix#host`
-8. nh should be installed now so enjoy and use `nh darwin switch`
+2. xfer or git clone flake to ~/.nix
+3. install nix-darwin with: `nix run nix-darwin -- switch --flake ~/.nix#host`
+4. nh should be installed now so enjoy and use `nh darwin switch`
 */
 
   imports = [
   ];
 
   # general macos system settings
-  # base system package install list
-  environment.systemPackages = with pkgs; [
-    wget
-    curl
-    rsync
-    git
-    age
-    fzf
-    usbutils
-    pciutils
-    python3
-    vim
-    lf
-    btop
-    rectangle
-    pinentry_mac
-  ];
-
-  users.users.bhelderman = {
-    home = "/Users/bhelderman";
-    # optional extras, e.g. shell, uid, etc.
-  };
-
-  # define home-manager user
-  home-manager = {
-    extraSpecialArgs = {inherit inputs;};
-    backupFileExtension = "bak";
-    useUserPackages = true;
-    useGlobalPkgs = false;
-    users = {
-      "bhelderman" = import ../../users/blake/home_darwin.nix;
-    };
-  };
-
-
-  # set timezone
-  time.timeZone = "America/Chicago";
-
-  # allow proprietary packages
-  nixpkgs.config.allowUnfree = true;
-
-  # enable flakes
-  nix.settings.experimental-features = ["nix-command" "flakes"];
-
   system = {
-    stateVersion = 6;
     defaults = {
       trackpad = {
         Clicking = true; 
@@ -142,5 +93,48 @@ instructions for first time setup for macos here
     };
   };
 
+  # base system package install list
+  environment.systemPackages = with pkgs; [
+    wget
+    curl
+    rsync
+    git
+    age
+    fzf
+    usbutils
+    pciutils
+    python3
+    vim
+    lf
+    btop
+    rectangle
+    pinentry_mac
+  ];
+
+  users.users.bhelderman = {
+    home = "/Users/bhelderman";
+    # optional extras, e.g. shell, uid, etc.
+  };
+
+  # define home-manager user
+  home-manager = {
+    extraSpecialArgs = {inherit inputs;};
+    backupFileExtension = "bak";
+    useUserPackages = true;
+    useGlobalPkgs = false;
+    users = {
+      "bhelderman" = import ../../users/blake/home_darwin.nix;
+    };
+  };
+
+
+  # set timezone
+  time.timeZone = "America/Chicago";
+
+  # allow proprietary packages
+  nixpkgs.config.allowUnfree = true;
+
+  # enable flakes
+  nix.settings.experimental-features = ["nix-command" "flakes"];
 
 }

modules/darwin/apps/default.nix

@@ -20,26 +20,25 @@ in {
 
     homebrew = {
       brews = [
+      ];
+      casks = [
+        "gnucash"
+        "utm"
+        "libreoffice"
         "iperf3"
         "nmap"
         "p7zip"
         "sl"
         "cowsay"
       ];
-      casks = [
-        "gnucash"
-        "utm"
-        "libreoffice"
-        "firefox"
-      ];
       masApps = {
-#        "pages" = 409201541;
-#        "numbers" = 409203825;
-#        "keynote" = 409183694;
- #       "bitwarden" = 1352778147;
-#        "darkreader" = 1438243180;
-#        "ghostery" = 6504861501;
-#        "privacy" = 6449850851;
+        "pages" = 409201541;
+        "numbers" = 409203825;
+        "keynote" = 409183694;
+        "bitwarden" = 1352778147;
+        "darkreader" = 1438243180;
+        "ghostery" = 6504861501;
+        "privacy" = 6449850851;
       };
     };
   };

modules/darwin/default.nix

@@ -10,7 +10,6 @@
     ./syncthing
     ./yubikey
     ./work
-    ./apps
 #    ./sops
   ];
 

modules/darwin/work/default.nix

@@ -26,7 +26,7 @@ in {
         "microsoft-office"
       ];
       masApps = {
-#        "configurator" = 1168254295;
+        "configurator" = 1168254295;
       };
     };
 

users/blake/hosts/cen-it-07.nix

@@ -26,7 +26,6 @@ in {
     xdg.enable = true;
 
     kitty.enable = true;
-    firefox.enable = true;
     
   };