Marisa: add builder and misc changes

hosts/servers/marisa/builder.nix

@@ -0,0 +1,14 @@
+{config, ...}:
+{
+  nix.buildMachines = [ {
+	 hostName = "Satori";
+	 system = "aarch64-linux";
+	 maxJobs = 4;
+	 speedFactor = 2;
+	 supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
+	}] ;
+	nix.distributedBuilds = true;
+	nix.extraOptions = ''
+		builders-use-substitutes = true
+	'';
+}

hosts/servers/marisa/networking.nix

@@ -3,7 +3,7 @@
   networking = {
     hostName = "Marisa";
     firewall = {
-      allowedTCPPorts = [ 22 80 6060 5001 8800 ];
+      allowedTCPPorts = [ 22 80 6060 5001 8800 8888 ];
       allowedUDPPorts = [ 17840 ];
     };
     wireless = {
@@ -22,7 +22,7 @@
     wireguard.interfaces.wg0 = {
       ips = [ "10.55.0.2/24" ];
       listenPort = 17840;
-      privateKeyFile = "/var/secrets/wg.key";
+      privateKeyFile = "/var/wg";
       peers = [
         {
           #Oracle VM1

hosts/servers/marisa/services.nix

@@ -5,10 +5,6 @@
       enable = true;
       permitRootLogin = "yes";
     };
-    dovecot2 = {
-      enable = true;
-      enableImap = true;
-    };
     vault = {
       package = pkgs.vault-bin;
       enable = true;
@@ -42,7 +38,7 @@
         template = [
           {
             source = pkgs.writeText "gitea.tpl" ''
-              {{ with secret "kv/systems/Marisa" }}{{ .Data.data.gitea }}{{ end }}
+              {{ with secret "kv/systems/Marisa/gitea" }}{{ .Data.data.gitea }}{{ end }}
             '';
             destination = "/var/secrets/gitea.key";
           }