From de5649cc5c6f5fabdc4354c805709e7128f98295 Mon Sep 17 00:00:00 2001
From: Jermeiah S <owner@arouzing.xyz>
Date: Thu, 19 Jun 2025 22:18:57 -0400
Subject: [PATCH 1/2] fix deploy-rs

---
 .../nixos/forgejo-runner-tofu/default.nix        | 16 ++++++++++++----
 modules/flake/deploy.nix                         |  2 +-
 modules/nixos/common/default.nix                 |  6 +++++-
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/configurations/nixos/forgejo-runner-tofu/default.nix b/configurations/nixos/forgejo-runner-tofu/default.nix
index 72c8b0a..c61909a 100644
--- a/configurations/nixos/forgejo-runner-tofu/default.nix
+++ b/configurations/nixos/forgejo-runner-tofu/default.nix
@@ -18,12 +18,20 @@ in
   ];
 
   nix.settings = {
-    allowed-users = [ "gitea-runner" ];
-    trusted-users = [ "gitea-runner" ];
+    allowed-users = [
+      "root"
+      "@wheel"
+      "@builders"
+      "gitea-runner"
+    ];
+    trusted-users = [
+      "root"
+      "gitea-runner"
+    ];
   };
   sops.secrets.forgejo-runners-token = {
-    # owner = "gitea-runner";
-    # group = "gitea-runner";
+    owner = "gitea-runner";
+    group = "gitea-runner";
     mode = "0777";
   };
   services.gitea-actions-runner = {
diff --git a/modules/flake/deploy.nix b/modules/flake/deploy.nix
index d5f1f3e..3333eb7 100644
--- a/modules/flake/deploy.nix
+++ b/modules/flake/deploy.nix
@@ -53,7 +53,7 @@ in
     autoRollback = false;
     magicRollback = true;
     user = "root";
-    remoteBuild = true;
+    # remoteBuild = true;
     nodes = lib.mapAttrs genNode deployableNodes;
   };
 }
diff --git a/modules/nixos/common/default.nix b/modules/nixos/common/default.nix
index 7ce1b90..00b1b8e 100644
--- a/modules/nixos/common/default.nix
+++ b/modules/nixos/common/default.nix
@@ -8,11 +8,15 @@
     ];
   zramSwap.enable = true;
   nixpkgs.hostPlatform = "x86_64-linux";
-  nixpkgs.overlays = [ flake.inputs.self.overlays.default ];
+  nixpkgs.overlays = [
+    flake.inputs.self.overlays.default
+    # flake.inputs.deploy-rs.overlays.default
+  ];
   services.tailscale = {
     enable = true;
   };
   environment.systemPackages = with pkgs; [
     git
+    deploy-rs
   ];
 }

From d5817599edadf539d344ee47f0b8947c638b1142 Mon Sep 17 00:00:00 2001
From: Jermeiah S <owner@arouzing.xyz>
Date: Thu, 19 Jun 2025 22:33:52 -0400
Subject: [PATCH 2/2] adjust builder

---
 .forgejo/workflows/push.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.forgejo/workflows/push.yaml b/.forgejo/workflows/push.yaml
index 8903e5e..6bf527b 100644
--- a/.forgejo/workflows/push.yaml
+++ b/.forgejo/workflows/push.yaml
@@ -1,9 +1,9 @@
 on: [push]
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: native:host
     steps:
       # - uses: DeterminateSystems/nix-installer-action@main
       # - uses: DeterminateSystems/magic-nix-cache-action@main
-      # - run: nix flake check .
-      - run: echo hi
+      - run: nix flake check .
+      # - run: echo hi