Fix ssh in workflow

joinemm · Jul 10, 2024 · bba2095 · bba2095
1 parent 4d653a7
commit bba2095
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -57,13 +57,12 @@ jobs:
 
       - name: Ssh config
         run: |
+          sudo mkdir /etc/ssh/sockets
           sudo sh -c "cat >> /etc/ssh/ssh_config << EOF
-          Host *
               ControlMaster auto
               ControlPath /etc/ssh/sockets/%r@%h-%p
-              ControlPersist 5s
+              ControlPersist 10m
           EOF"
-          cat /etc/ssh/ssh_config
 
       - name: Configure remote builders
         run: |
@@ -77,4 +76,4 @@ jobs:
 
 
       - name: Build ${{ matrix.host }}
-        run: nix run nixpkgs#nixos-rebuild -- build -v --accept-flake-config --flake ".#${{ matrix.host }}"
+        run: nix run nixpkgs#nixos-rebuild -- build --accept-flake-config --flake ".#${{ matrix.host }}"
diff --git a/flake.nix b/flake.nix
@@ -2,14 +2,11 @@
   description = "A Special Snowflake :3";
 
   nixConfig = {
-    allow-import-from-derivation = true;
     extra-substituters = [
       "https://nix-gaming.cachix.org?priority=42"
-      "https://joinemm.cachix.org"
     ];
     extra-trusted-public-keys = [
       "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="
-      "joinemm.cachix.org-1:aMZBO1baRjhaI5QzePLelFz/GJ82fZOjmiHQwCl1FxI="
     ];
   };