Try to fix tests

mikesplain · Jun 11, 2024 · e51559e · e51559e
1 parent 5d42f88
commit e51559e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/nix-test.yaml b/.github/workflows/nix-test.yaml
@@ -32,10 +32,9 @@ jobs:
           github_access_token: ${{ secrets.GITHUB_TOKEN }}
       - name: Setup
         run: |
-          sed -i '' "s/default/$(scutil --get LocalHostName)/g" nixos-config/hosts/default/configuration.nix
-          sed -i '' "s/mike.splain/runner/g" nixos-config/hosts/default/configuration.nix
-          sed -i '' "s/default = nix-darwin.lib.darwinSystem/$(scutil --get LocalHostName) = nix-darwin.lib.darwinSystem/g" nixos-config/flake.nix
-          sed -i '' "s/aarch64-darwin/${{matrix.os.arch}}/g" nixos-config/flake.nix
+          sed -i '' "s/defaultHostname/$(scutil --get LocalHostName)/g" nixos-config/flake.nix
+          sed -i '' "s/mike.splain/runner/g" nixos-config/flake.nix
+          sed -i '' "s/defaultHostname/${{matrix.os.arch}}/g" nixos-config/flake.nix
 
           sudo mv /etc/nix/nix.conf /etc/nix/nix.conf.before-nix-darwin
           sudo mv /etc/shells /etc/shells.before-nix-darwin

diff --git a/nixos-config/flake.nix b/nixos-config/flake.nix
@@ -174,6 +174,11 @@
         hostName = "SNS005454";
         # username = "mike.splain";
       };
+      defaultHostname = configuration.system {
+        system = "defaultSystem";
+        hostName = "defaultHostname";
+        # username = "mike.splain";
+      };
 
 
       # SNS005454 = nix-darwin.lib.darwinSystem {

diff --git a/nixos-config/result b/nixos-config/result