summaryrefslogtreecommitdiff
path: root/.github/workflows
diff options
context:
space:
mode:
authorMichael Hoang <enzime@users.noreply.github.com>2024-11-17 02:33:37 +1100
committerMichael Hoang <enzime@users.noreply.github.com>2024-11-21 11:07:47 +1100
commit9a1bea70d5728a19ee0a090dc0bcdeb73f09b7a4 (patch)
tree36ff284dcaf10d881c1c6ab4594e2eab7fef208b /.github/workflows
parent5cc3c00f9b689fa98c524674ddf5a569005e4bd9 (diff)
installer: move creating default configuration to README
Diffstat (limited to '.github/workflows')
-rw-r--r--.github/workflows/test.yml20
1 files changed, 8 insertions, 12 deletions
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 92d06d4..90bd6fd 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -49,17 +49,15 @@ jobs:
run: |
export NIX_PATH=$HOME/.nix-defexpr/channels
- # We run nix-darwin twice to test that it can create darwin-configuration correctly for us
- # but we expect it to fail setting up /etc/nix/nix.conf
- nix-shell -A installer || true
+ mkdir -p ~/.config/nix-darwin
+ cp modules/examples/simple.nix ~/.config/nix-darwin/configuration.nix
nixConfHash=$(shasum -a 256 /etc/nix/nix.conf | cut -d ' ' -f 1)
/usr/bin/sed -i.bak \
"s/# programs.fish.enable = true;/nix.settings.access-tokens = [ \"github.com=\${{ secrets.GITHUB_TOKEN }}\" ]; environment.etc.\"nix\/nix.conf\".knownSha256Hashes = [ \"$nixConfHash\" ];/" \
- ~/.nixpkgs/darwin-configuration.nix
+ ~/.config/nix-darwin/configuration.nix
- nix-shell -A installer
- nix-shell -A installer.check
+ nix-shell -A installer -I darwin-config=$HOME/.config/nix-darwin/configuration.nix
- name: Build and activate default derivation
run: |
. /etc/static/bashrc
@@ -97,17 +95,15 @@ jobs:
run: |
export NIX_PATH=$HOME/.nix-defexpr/channels
- # We run nix-darwin twice to test that it can create darwin-configuration correctly for us
- # but we expect it to fail setting up /etc/nix/nix.conf
- nix-shell -A installer || true
+ mkdir -p ~/.config/nix-darwin
+ cp modules/examples/simple.nix ~/.config/nix-darwin/configuration.nix
nixConfHash=$(shasum -a 256 /etc/nix/nix.conf | cut -d ' ' -f 1)
/usr/bin/sed -i.bak \
"s/# programs.fish.enable = true;/nix.settings.access-tokens = [ \"github.com=\${{ secrets.GITHUB_TOKEN }}\" ]; environment.etc.\"nix\/nix.conf\".knownSha256Hashes = [ \"$nixConfHash\" ];/" \
- ~/.nixpkgs/darwin-configuration.nix
+ ~/.config/nix-darwin/configuration.nix
- nix-shell -A installer
- nix-shell -A installer.check
+ nix-shell -A installer -I darwin-config=$HOME/.config/nix-darwin/configuration.nix
- name: Build and activate default derivation
run: |
. /etc/static/bashrc