From cf40354daee832052036732b44fab5603f83f353 Mon Sep 17 00:00:00 2001
From: Devin Finlinson <devin.finlinson@pm.me>
Date: Mon, 13 Apr 2026 21:30:23 -0600
Subject: ack is a good tool

---
 modules/nixos/system-packages.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'modules/nixos')

diff --git a/modules/nixos/system-packages.nix b/modules/nixos/system-packages.nix
index 07696ae..be78370 100644
--- a/modules/nixos/system-packages.nix
+++ b/modules/nixos/system-packages.nix
@@ -11,6 +11,7 @@
     nvd
     unzip
     git
+    ack #like git-grep but works outside git repos
     wl-clipboard
     pciutils
     usbutils
-- 
cgit v1.3.1


From 92c419df57a72545a3ca444bdbd6217b6718b925 Mon Sep 17 00:00:00 2001
From: Devin Finlinson <devin.finlinson@pm.me>
Date: Mon, 13 Apr 2026 21:31:12 -0600
Subject: tailscale was bypassing firewall

---
 modules/nixos/tailscale.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'modules/nixos')

diff --git a/modules/nixos/tailscale.nix b/modules/nixos/tailscale.nix
index e3635fd..8fa49be 100644
--- a/modules/nixos/tailscale.nix
+++ b/modules/nixos/tailscale.nix
@@ -5,6 +5,7 @@
       "--login-server https://bosco.myrmexia.xyz"
       "--operator defin"
     ];
+    extraSetFlags = ["--netfilter-mode=nodivert"];
   };
   systemd.services.tailscaled.after = [ "systemd-networkd-wait-online.service" ];
   networking.firewall = {
-- 
cgit v1.3.1


From af9a0e56e110b0edd0cf9854a1dd534265cdb0e8 Mon Sep 17 00:00:00 2001
From: Devin Finlinson <devin.finlinson@pm.me>
Date: Mon, 13 Apr 2026 21:36:02 -0600
Subject: configure remote builders

---
 machines/zenbook/default.nix   |  1 +
 modules/nixos/remote-build.nix | 20 ++++++++++++++++++++
 modules/users/defin.nix        |  1 -
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 modules/nixos/remote-build.nix

(limited to 'modules/nixos')

diff --git a/machines/zenbook/default.nix b/machines/zenbook/default.nix
index f3ebeb1..0597811 100644
--- a/machines/zenbook/default.nix
+++ b/machines/zenbook/default.nix
@@ -7,6 +7,7 @@
 {
   imports = [
     ./hardware-configuration.nix
+    ../../modules/nixos/remote-build.nix
 
     ../../modules/nixos/hyprland.nix
     ../../modules/nixos/niri.nix
diff --git a/modules/nixos/remote-build.nix b/modules/nixos/remote-build.nix
new file mode 100644
index 0000000..79da57e
--- /dev/null
+++ b/modules/nixos/remote-build.nix
@@ -0,0 +1,20 @@
+{ config, ... } : {  
+  nix.distributedBuilds = true;
+  # nix.settings.builders-use-subsituters = true;
+  nix.buildMachines = [
+    {
+      hostName = "doretta";
+      systems = [ "x86_64-linux" "aarch64-linux"];
+      supportedFeatures = [
+        "nixos-test"
+        "benchmark"
+        "big-parallel"
+        "llvm"
+       ];
+      maxJobs = 2; # could be higher but slow internet
+      speedFactor = 1;
+      sshKey = "/root/.ssh/nixremote";
+      sshUser = "nixremote";
+    }
+  ];
+}
diff --git a/modules/users/defin.nix b/modules/users/defin.nix
index 9cd1548..3b26ed2 100644
--- a/modules/users/defin.nix
+++ b/modules/users/defin.nix
@@ -25,7 +25,6 @@
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB5CATqAUsBWLTIaqtdAS/EO3L/04NwKEmnv7D68vO+a defin@biski"
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILuW75N5K0/83bOgsB/yymgIHoQgaaAJjW9MMDG9s/2p defin@picast2"
         # keys for remote build
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPY7aJCzJmN0XYdf8Ehp/OY71y8WudmW7sWA9Nb+pncL root@doretta"
       ];
     };
   };
-- 
cgit v1.3.1