macos.yml: Home Manager after nixos-rebuild, use NIX_CONFIG too

Author: msgilligan

.github/workflows/macos.yml

@@ -45,27 +45,6 @@ jobs:
           set -eux
           limactl start --name=nixsample --set '.user.name = "${{ env.LIMA_USER }}"' nixos.yaml
 
-      - name: "Initialize Home Manager"
-        if: false # Disable for now because this step is timing out
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          LIMA_NAME: "nixsample"
-          GUEST_HOME: "/home/lima.linux"
-          CONFIG_DIR: "/home/lima.linux/.config"
-          HOME_CONFIG_REPO: "https://github.com/nixos-lima/nixos-lima-config-sample.git"
-        run: |
-          set -eux
-          # Create ~/.config if it doesn't already exist
-          limactl shell nixsample -- mkdir -p $CONFIG_DIR
-          # Checkout HOME_CONFIG_REPO containing your Home Manager configuration flake
-          limactl shell nixsample -- git clone $HOME_CONFIG_REPO $CONFIG_DIR/home-manager
-          # Temporarily (it will be overwritten on the next nixos-rebuild) add a GitHub access token to nix.conf so
-          # we can init Home Manager without getting rate limited by GitHub Actions
-          limactl shell nixsample -- sudo sh -c "echo 'access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}' >> /etc/nix/nix2.conf"
-          # Initialize Home Manager
-          limactl shell nixsample -- nix run home-manager/master -- init --switch
-          # Configure subuid/subgid support for running rootless Podman services
-          limactl shell nixsample -- sudo usermod --add-subuids 100000-165535 --add-subgids 100000-165535 $LIMA_USER
 
       - name: "Update and Rebuild NixOS"
         env:
@@ -83,7 +62,27 @@ jobs:
           limactl shell nixsample -- sudo git init --separate-git-dir=$CONFIG_DIR/nixos-config --shared=group /etc/nixos
           limactl shell nixsample -- sudo chown $LIMA_USER:wheel -R $CONFIG_DIR/nixos-config
           limactl shell nixsample -- sudo bash -c "cd /etc/nixos ; git checkout master"
-          limactl shell nixsample -- sudo bash -c "NIX_CONFIG='access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}' nixos-rebuild switch --flake .#sample"
+          limactl shell nixsample -- sudo bash -c "NIX_CONFIG='access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}' nixos-rebuild boot --flake .#sample"
+          limactl stop nixsample
+          limactl start nixsample
+
+      - name: "Initialize Home Manager"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          LIMA_NAME: "nixsample"
+          GUEST_HOME: "/home/lima.linux"
+          CONFIG_DIR: "/home/lima.linux/.config"
+          HOME_CONFIG_REPO: "https://github.com/nixos-lima/nixos-lima-config-sample.git"
+        run: |
+          set -eux
+          # Create ~/.config if it doesn't already exist
+          limactl shell nixsample -- mkdir -p $CONFIG_DIR
+          # Checkout HOME_CONFIG_REPO containing your Home Manager configuration flake
+          limactl shell nixsample -- git clone $HOME_CONFIG_REPO $CONFIG_DIR/home-manager
+          # Initialize Home Manager
+          limactl shell nixsample -- bash -c "NIX_CONFIG='access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}' nix run home-manager/master -- init --switch"
+          # Configure subuid/subgid support for running rootless Podman services
+          #limactl shell nixsample -- sudo usermod --add-subuids 100000-165535 --add-subgids 100000-165535 $LIMA_USER
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4