Merge pull request #369 from mikesplain/modified_layout

Modified layout

.github/workflows/nix-test.yaml

@@ -40,9 +40,14 @@ jobs:
           sudo mv /etc/nix/nix.conf /etc/nix/nix.conf.before-nix-darwin
           sudo mv /etc/shells /etc/shells.before-nix-darwin
 
-      - name: Test
-        env: 
+      - name: Test - Nix Run
+        env:
           NIX_CONFIG: "access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}"
         run: |
           nix run nix-darwin --extra-experimental-features nix-command --extra-experimental-features flakes -- switch --flake ./nixos-config
-      # - run: nix build
+
+      - name: Test - Switch
+        env:
+          NIX_CONFIG: "access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}"
+        run: |
+          darwin-rebuild switch --flake ./nixos-config

nixos-config/README.md

@@ -4,8 +4,13 @@
 Referenced heavily: https://github.com/computercam/_unixconf_nix
 https://github.com/LnL7/nix-darwin
 
+New reference: https://github.com/eaksa/eaksa/blob/main/flake.nix
+
 ## Commands
 ```
+# Install nix if needed
+curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix | sh -s -- install
+
 # Installing nix-darwin
 nix run nix-darwin --extra-experimental-features nix-command --extra-experimental-features flakes -- switch --flake .
 # Using nix-darwin
@@ -29,6 +34,10 @@ curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix
 ## Uninstall
 - Nix darwin first
 ```
+# Make sure nixpkgs is setup:
+nix-channel --add https://nixos.org/channels/nixpkgs-unstable
+nix-channel --update
+
 # this or the included darwin-uninstaller command.
 nix-build https://github.com/LnL7/nix-darwin/archive/master.tar.gz -A uninstaller
 ./result/bin/darwin-uninstaller