fix

Author: ADGEfficiency

.github/workflows/test.yml

@@ -9,24 +9,10 @@ jobs:
       XDG_CONFIG_HOME: ${{ github.workspace }}
     steps:
       - uses: actions/checkout@v3
-      - run: make nix-pkgs OS=ubuntu devShell=''
-      - run: . ./nix/load-ubuntu.sh && make test -o setup-nix OS=ubuntu STOW_ARGS='--v
-          --adopt'
-      - run: . ./nix/load-ubuntu.sh && sudo -E make setup-ubuntu -o setup-nix OS=ubuntu
-          STOW_ARGS='--v --adopt'
-      #  TODO having problems with zsh being available
-      #  can't set $PATH correctly
-      # - run: . ./nix/load-linux.sh && sudo -E make js python OS=linux
-  # macos:
-  #   runs-on: macos-latest
-  #   env:
-  #     XDG_CONFIG_HOME: ${{ github.workspace }}
-  #     NIXPKGS_ALLOW_BROKEN: 1
-  #   steps:
-  #     - uses: actions/checkout@v3
-  #     - uses: actions/setup-node@v3
-  #       with:
-  #         node-version: 16
-  #     - run: make nix-pkgs OS=macos
-  #     - run: . ./nix/load-macos.sh && make test -o setup-nix OS=macos STOW_ARGS='--v
-  #         --adopt'
+  macos:
+    runs-on: macos-latest
+    env:
+      XDG_CONFIG_HOME: ${{ github.workspace }}
+      NIXPKGS_ALLOW_BROKEN: 1
+    steps:
+      - uses: actions/checkout@v3

Makefile

@@ -69,7 +69,7 @@ setup-nix:
 
 NIX_ARGS=--extra-experimental-features nix-command --extra-experimental-features flakes
 nix-pkgs: setup-nix
-	. ./nix/load-"$(OS)".sh && cd nix && nix flake update $(NIX_ARGS) && (nix profile upgrade $(NIX_ARGS) nix || nix profile install $(NIX_ARGS) .)
+	. ./nix/load-"$(OS)".sh && cd nix && nix flake update "$(NIX_ARGS)" && (nix profile upgrade "$(NIX_ARGS)" nix || nix profile install "$(NIX_ARGS)" .)
 
 .PHONY: setup-brew brew-pkgs
 

README.md

@@ -1,6 +1,6 @@
 # dotfiles
 
-Setup and configuration for my terminal based developer workflow:
+Setup and configuration for my terminal based developer workflow (MacOS/Ubuntu):
 
 - Zsh for a shell
 - Nix for package management of shell programs
@@ -10,6 +10,12 @@ Setup and configuration for my terminal based developer workflow:
 
 This repo should be cloned into `$HOME` and set as `$XDG_CONFIG_HOME`.
 
+You can setup your machine using commands in `Makefile`.  Commonly setting up a machine involves:
+
+- Installing packages with Nix or Homebrew
+- Setting up symlinks with Stow
+- Setting up tmux & Zsh
+
 ## Use
 
 ### Ubuntu