diff --git a/flake.nix b/flake.nix
index 18d9c3b..088fd92 100644
--- a/flake.nix
+++ b/flake.nix
@@ -25,7 +25,7 @@
     emacs-overlay.url = github:nix-community/emacs-overlay;
     nvim-overlay = {
       url = github:nix-community/neovim-nightly-overlay;
- #     inputs.nixpkgs.url = github:nixos/nixpkgs?rev=fad51abd42ca17a60fc1d4cb9382e2d79ae31836;
+      #     inputs.nixpkgs.url = github:nixos/nixpkgs?rev=fad51abd42ca17a60fc1d4cb9382e2d79ae31836;
     };
     hyprland = {
       url = github:hyprwm/Hyprland;
diff --git a/home/natto/emacs.nix b/home/natto/emacs.nix
index 94a5c7d..c4cc6e4 100644
--- a/home/natto/emacs.nix
+++ b/home/natto/emacs.nix
@@ -10,7 +10,7 @@ let
         use-package
         (epkgs.tree-sitter-langs.withPlugins (_: epkgs.tree-sitter-langs.plugins))
       ];
-     /* override = {
+      /* override = {
         stm32-emacs = trivialBuild rec {
           pname = "stm32-emacs";
           version = haskellPackages.Agda.version;
diff --git a/hosts/default.nix b/hosts/default.nix
index af57e63..692a59b 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -38,6 +38,7 @@ in
       system = "x86_64-linux";
       modules = [
         ./remilia
+        ./modules/x86builder.nix
         inputs.mailserver.nixosModules.mailserver
         { nixpkgs.pkgs = self.legacyPackages.${system}; }
       ]
diff --git a/hosts/modules/minimal.nix b/hosts/modules/minimal.nix
index bb8570f..079d1a1 100644
--- a/hosts/modules/minimal.nix
+++ b/hosts/modules/minimal.nix
@@ -39,16 +39,7 @@
     package = pkgs.nixUnstable;
     extraOptions = ''
       experimental-features = nix-command flakes
-      builders-use-substitutes = true
     '';
-    settings.trusted-users = [ "root" ];
-    buildMachines = [{
-      hostName = "satori";
-      systems = [ "x86_64-linux" "aarch64-linux" ];
-      maxJobs = 4;
-      speedFactor = 2;
-      supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
-    }];
-    distributedBuilds = true;
+    settings.trusted-users = [ "root" "spark" ];
   };
 }
diff --git a/hosts/modules/x86builder.nix b/hosts/modules/x86builder.nix
new file mode 100644
index 0000000..940aa1e
--- /dev/null
+++ b/hosts/modules/x86builder.nix
@@ -0,0 +1,16 @@
+{ config, ... }:
+{
+  nix = {
+    extraOptions = ''
+      builders-use-substitutes = true
+    '';
+    buildMachines = [{
+      hostName = "satori";
+      systems = [ "x86_64-linux" "aarch64-linux" ];
+      maxJobs = 4;
+      speedFactor = 2;
+      supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
+    }];
+    distributedBuilds = true;
+  };
+}
diff --git a/hosts/remilia/services.nix b/hosts/remilia/services.nix
index 189f9a0..2e0ebee 100644
--- a/hosts/remilia/services.nix
+++ b/hosts/remilia/services.nix
@@ -56,7 +56,7 @@ in
           "vault.${domain}" = genericHttpRProxy { addr = "https://${marisa}:8800"; };
           "consul.${domain}" = genericHttpRProxy { addr = "http://${marisa}:8500"; };
           "f.${domain}" = genericHttpRProxy { addr = "http://${marisa}:8888"; };
- #         "radio.${domain}" = genericHttpRProxy { addr = "http://${satori}:8001"; };
+          #         "radio.${domain}" = genericHttpRProxy { addr = "http://${satori}:8001"; };
           "radio.${domain}" = {
             addSSL = true;
             enableACME = true;
@@ -68,7 +68,7 @@ in
               '';
             };
             locations."= /".return = "301 /radio";
-           };
+          };
 
           "git.${domain}" = genericHttpRProxy {
             addr = "http://${marisa}:5000";
diff --git a/hosts/satori/services.nix b/hosts/satori/services.nix
index 22210cb..fdc8854 100644
--- a/hosts/satori/services.nix
+++ b/hosts/satori/services.nix
@@ -1,26 +1,26 @@
 { lib, config, pkgs, ... }:
 let
 
-udev-cypher = pkgs.stdenv.mkDerivation {
-  name = "udev-cypher";
+  udev-cypher = pkgs.stdenv.mkDerivation {
+    name = "udev-cypher";
 
-  dontBuild = true;
-  dontConfigure = true;
-  dontUnpack = true;
+    dontBuild = true;
+    dontConfigure = true;
+    dontUnpack = true;
 
-  installPhase = ''
-    mkdir -p $out/lib/udev/rules.d
-    touch $out/lib/udev/rules.d/21-cypherock.rules
-cat << 'EOF' >> $out/lib/udev/rules.d/21-cypherock.rules
-SUBSYSTEM=="input", GROUP="input", MODE="0666"
-SUBSYSTEM=="usb", ATTRS{idVendor}=="3503", ATTRS{idProduct}=="0103", MODE="666", GROUP="plugdev"
-KERNEL=="hidraw*", ATTRS{idVendor}=="3503", ATTRS{idProduct}=="0103", MODE="0666", GROUP="plugdev"
-0483:374f
-SUBSYSTEM=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="374f", MODE="666", GROUP="plugdev"
-KERNEL=="hidraw*", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="374f", MODE="0666", GROUP="plugdev"
-EOF
-  '';
-};
+    installPhase = ''
+          mkdir -p $out/lib/udev/rules.d
+          touch $out/lib/udev/rules.d/21-cypherock.rules
+      cat << 'EOF' >> $out/lib/udev/rules.d/21-cypherock.rules
+      SUBSYSTEM=="input", GROUP="input", MODE="0666"
+      SUBSYSTEM=="usb", ATTRS{idVendor}=="3503", ATTRS{idProduct}=="0103", MODE="666", GROUP="plugdev"
+      KERNEL=="hidraw*", ATTRS{idVendor}=="3503", ATTRS{idProduct}=="0103", MODE="0666", GROUP="plugdev"
+      0483:374f
+      SUBSYSTEM=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="374f", MODE="666", GROUP="plugdev"
+      KERNEL=="hidraw*", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="374f", MODE="0666", GROUP="plugdev"
+      EOF
+    '';
+  };
 in
 {
   services = {