From 214e45f138ef326d07836d7d3bf91fcc7d58385b Mon Sep 17 00:00:00 2001
From: Grey Jones <grey@greyweather.dev>
Date: Tue, 28 Jul 2026 01:26:42 +0100
Subject: [PATCH] Add remote builds (#4)

Reviewed-on: https://git.greyweather.dev/greyweather/nixos/pulls/4
---
 global-default.nix                        |  1 -
 hosts/kitagawa/default.nix                | 20 ++++++++++++++++++++
 hosts/kitagawa/home.nix                   |  1 -
 hosts/takamaki/modules/remote-builder.nix |  4 +++-
 modules/window-managers/niri.nix          |  2 +-
 5 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/global-default.nix b/global-default.nix
index a82eebd..d3a7df8 100644
--- a/global-default.nix
+++ b/global-default.nix
@@ -53,7 +53,6 @@ in {
     isNormalUser = true;
     description = "grey";
     extraGroups = [ "networkmanager" "wheel" ];
-    packages = with pkgs; [];
   };
 
   nixpkgs.config.allowUnfree = true;
diff --git a/hosts/kitagawa/default.nix b/hosts/kitagawa/default.nix
index 6a7ccd2..599ba14 100644
--- a/hosts/kitagawa/default.nix
+++ b/hosts/kitagawa/default.nix
@@ -18,6 +18,26 @@ in {
     ./modules/hardware-fixes.nix
   ];
 
+  nix.buildMachines = [
+    {
+      hostName = "builder";
+      systems = [ "x86_64-linux" "i686-linux" ];
+      protocol = "ssh-ng";
+      maxJobs = 25;
+      speedFactor = 100;
+      supportedFeatures = [ "nixos-test" "benchmark" "kvm" "big-parallel" ];
+    }
+    {
+      hostName = "localhost";
+      systems = [ "x86_64-linux" "i686-linux" ];
+      maxJobs = 10;
+      speedFactor = 1;
+      supportedFeatures = [ ];
+    }
+  ];
+  nix.distributedBuilds = true;
+  nix.settings.builders-use-substitutes = true;
+
   services.tailscale = {
     enable = true;
     openFirewall = true;
diff --git a/hosts/kitagawa/home.nix b/hosts/kitagawa/home.nix
index f6f74e6..ff7d808 100644
--- a/hosts/kitagawa/home.nix
+++ b/hosts/kitagawa/home.nix
@@ -36,7 +36,6 @@ in {
     kdePackages.filelight
     remmina
     freerdp
-    jmtpfs
     loupe
   ];
 
diff --git a/hosts/takamaki/modules/remote-builder.nix b/hosts/takamaki/modules/remote-builder.nix
index e9a175e..16d1a09 100644
--- a/hosts/takamaki/modules/remote-builder.nix
+++ b/hosts/takamaki/modules/remote-builder.nix
@@ -12,7 +12,9 @@
     openssh.authorizedKeys.keys = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCeYFzFyv1LEdWngyTDqnsdJQhmgAfQbbksyZrNWkameVMJpi8IJ+3IIrL96BtD8EAC/jxHIbri49TInN0lYRBH3cH3jbBupdDFaziH3ohyMoeg8enKYsiisaT+MTGEGFygF9Ul1WDrOM1oThEP1LTYj5pWNfZRtIG870jLzRkNczb0eCtEO0qWtyH92Cb5BSpXBKd4Eaysvkm5ex77I5Y1Hl0RUjyEiegiwC1LrcrFhjhVFQGlShTr5kf/LJrwamyGJx4oLi462Omf/jLwNoIMLNgxzuJBynYK714AY9U/IbNq//bEQro6i2cwxPm4lSTaGemnhvEItHsDfbeAJ06iqOl51OtsM2qees2ygCgFvraKNRTmOoRkhS/IwC1bqoMqR8uraYcfKlXeXBjYnJbVG6u/SAGLg7Llmt5UAs7a6/W/7ytWJ90uQVjgPcb7h+9ji+jK18EQUd/AAknfLkLE5IoU5wj6+2OTAGeCT46BbMpYOk2RJinUy93VBIPuRyvZ5tdIt76BPt3JgosYbYtbdkyZTI8V72iCVLWae1uCF2pJlZ1gLteaS0ZmkgyEsAchm8VaoE8NrIO4MBpyZ3fZ9gsprT5jsnUb9Hc+opKSgX+OwDjzM5BadCUFtvoJE3FNTv7koIDg2myHyYj+1kFxp6ctjNgP9V9/0rc4oWz9ew== grey@kitagawa" ];
   };
 
+  services.openssh.settings.AllowUsers = [ "remotebuild" ];
+
   users.groups.remotebuild = {};
 
   nix.settings.trusted-users = [ "remotebuild" ];
-}
\ No newline at end of file
+}
diff --git a/modules/window-managers/niri.nix b/modules/window-managers/niri.nix
index df7f051..bbac7ed 100644
--- a/modules/window-managers/niri.nix
+++ b/modules/window-managers/niri.nix
@@ -28,7 +28,7 @@
         src = pkgs.fetchFromGitHub {
           owner = "niri-wm";
           repo = "niri";
-          rev = "pull/3642";
+          rev = "d1163ba83f7e02c552886649f8e192fbc8a8326a";
           sha256 = "sha256-SiE5xZ0btBLDLAD4InmABPu/mHVE8yFexPHmx9FQ3FA=";
         };
         cargoDeps = pkgs.rustPlatform.fetchCargoVendor {