a lot of work

modules/builder/default.nix

@@ -1,4 +1,4 @@
 _: {
-  # home = ./home.nix;
+  home = ./home.nix;
   nixos = ./nixos.nix;
 }

modules/builder/home.nix

@@ -1,48 +1,39 @@
-# {
-#   config,
-#   lib,
-#   pkgs,
-#   fetchFromGitHub,
-#   ...
-# }:
-# let
-#   cfg = config.modules.fish;
-# in
-# {
-#   options.modules.fish = {
-#     enable = lib.mkEnableOption "Fish";
-#   };
-#   config = lib.mkIf cfg.enable {
-#     home.shell.enableFishIntegration = true;
-#     programs = {
-#       fish = {
-#         enable = true;
-#         shellInit = ''
-#                               set -g theme_nerd_fonts yes
-#                               set -g theme_color_scheme nord
-#                               set -g theme_display_user yes
-#                     set -g fish_color_autosuggestion 6F6578
-#           					alias nik 'nix'
-#                     					'';
-#         plugins = [
-#           {
-#             name = "bobthefish";
-#             src = pkgs.fetchFromGitHub {
-#               owner = "oh-my-fish";
-#               repo = "theme-bobthefish";
-#               rev = "e3b4d4eafc23516e35f162686f08a42edf844e40";
-#               sha256 = "sha256-cXOYvdn74H4rkMWSC7G6bT4wa9d3/3vRnKed2ixRnuA=";
-#             };
-#           }
-#         ];
-#       };
-#       eza = {
-#         enable = true;
-#         enableFishIntegration = true;
-#         icons = "auto";
-#         git = true;
-#         extraOptions = [ ];
-#       };
-#     };
-#   };
-# }
+{
+  config,
+  lib,
+  pkgs,
+  fetchFromGitHub,
+  ...
+}:
+let
+  cfg = config.modules.remoteBuild;
+in
+{
+  options.modules.remoteBuild = {
+    use-remote-builders = lib.mkEnableOption "remoteBuild";
+  };
+  config = lib.mkIf cfg.use-remote-builders {
+    nix.package = pkgs.nix;
+    nix.distributedBuilds = true;
+    nix.settings.builders-use-substitutes = true;
+
+    # Define every build machine here..
+    nix.buildMachines = [
+      {
+        # Main desktop pc
+        # ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKqsFEgtcTDw89GaZJg8P/FE1xngIXmiUZl8j0b+V7n+ root@doloroo-main
+        hostName = "doloroo-main";
+        sshUser = "remotebuild";
+        sshKey = "/root/.ssh/remotebuild";
+        # protocol = "ssh-ng";
+        maxJobs = 8;
+        speedFactor = 2;
+        supportedFeatures = [
+          "nixos-test"
+          "big-parallel"
+          "kvm"
+        ];
+      }
+    ];
+  };
+}

modules/builder/nixos.nix

@@ -33,6 +33,7 @@ let
     nix.settings.builders-use-substitutes = true;
 
     # Define every build machine here..
+    # also define in home manager (TODO make a single file with all builders)
     nix.buildMachines = [
       {
         # Main desktop pc