fix distributed setup local

hosts/common/optional/distributed_builds/local-machine.nix

@@ -11,8 +11,7 @@ in
 
   nix.buildMachines = [
     {
-      hostName = remoteMachineIp;
-      sshUser = "remotebuild";
+      hostName = "remotebuild@${remoteMachineIp}";
       speedFactor = 1;
       maxJobs = 10;
       sshKey = "/root/.ssh/remotebuild";
@@ -28,6 +27,14 @@ in
   #   };
   # };
 
+  programs.ssh.extraConfig = ''
+    Host ${remoteMachineIp}
+    	Port 22
+    	User remotebuild
+    	IdentitiesOnly yes
+    	IdentityFile /root/.ssh/remotebuild
+  '';
+
   sops.secrets = {
     "ssh_keys/root/remotebuild" = {
       path = "/root/.ssh/remotebuild";

hosts/semita/default.nix

@@ -59,8 +59,12 @@ in {
 
     ../common/optional/restic-backup.nix
     ../common/optional/nixos-containers/backup-server.nix
+<<<<<<< HEAD
      
     # Build nix derivations on remote machine
+=======
+
+>>>>>>> distributed-builds
     ../common/optional/distributed_builds/local-machine.nix
   ];