diff --git a/systems/default.nix b/systems/default.nix index 2531d1b1..021830f3 100644 --- a/systems/default.nix +++ b/systems/default.nix @@ -138,17 +138,23 @@ user = "root"; path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos inputs.self.nixosConfigurations.${name}; }; - hostname = "${name}.inskip.me"; - sshUser = "kat"; autoRollback = true; magicRollback = true; }; }) (set.optional (name != "renko") { - sshOpts = ["-p" "${builtins.toString (builtins.head inputs.self.nixosConfigurations.${name}.config.services.openssh.ports)}"]; + ${name} = { + hostname = "${name}.inskip.me"; + sshUser = "kat"; + sshOpts = ["-p" "${builtins.toString (builtins.head inputs.self.nixosConfigurations.${name}.config.services.openssh.ports)}"]; + }; }) (set.optional (name == "renko") { - sshOpts = ["-p" "32222"]; + ${name} = { + sshUser = "nixos"; + hostname = "orb"; + sshOpts = ["-p" "32222"]; + }; }) ]; diff --git a/systems/renko.nix b/systems/renko.nix index 965da3c1..1ee39c7f 100644 --- a/systems/renko.nix +++ b/systems/renko.nix @@ -12,7 +12,7 @@ _: let "${inputs.nixpkgs}/nixos/modules/virtualisation/lxc-container.nix" ]; - nix.extraOptions = "extra-platforms = x86_64-linux"; + nix.extraOptions = "extra-platforms = x86_64-linux i686-linux"; fileSystems = { "/" = { @@ -33,10 +33,12 @@ _: let pkgs.btop ]; - networking.nftables.enable = mkForce false; - - networking.useDHCP = false; - networking.interfaces.eth0.useDHCP = true; + networking = { + nftables.enable = mkForce false; + firewall.enable = mkForce false; + useDHCP = false; + interfaces.eth0.useDHCP = true; + }; nixpkgs.hostPlatform = mkDefault "aarch64-linux"; diff --git a/systems/sumireko.nix b/systems/sumireko.nix index 777cd3a6..83f4cbb7 100644 --- a/systems/sumireko.nix +++ b/systems/sumireko.nix @@ -22,9 +22,11 @@ _: let Port 32222 User default IdentityFile /Users/kat/.orbstack/ssh/id_ed25519 - ProxyCommand env HOME=/Users/kat '/Applications/OrbStack.app/Contents/Frameworks/OrbStack Helper (VM).app/Contents/MacOS/OrbStack Helper (VM)' ssh-proxy-fdpass - ProxyUseFdpass yes ''; + /* + ProxyCommand env HOME=/Users/kat '/Applications/OrbStack.app/Contents/Frameworks/OrbStack Helper (VM).app/Contents/MacOS/OrbStack Helper (VM)' ssh-proxy-fdpass + ProxyUseFdpass yes + */ }; nix.buildMachines = [ @@ -82,9 +84,11 @@ _: let Port 32222 User default IdentityFile /Users/kat/.orbstack/ssh/id_ed25519 - ProxyCommand env HOME=/Users/kat '/Applications/OrbStack.app/Contents/Frameworks/OrbStack Helper (VM).app/Contents/MacOS/OrbStack Helper (VM)' ssh-proxy-fdpass - ProxyUseFdpass yes ''; + /* + ProxyCommand env HOME=/Users/kat '/Applications/OrbStack.app/Contents/Frameworks/OrbStack Helper (VM).app/Contents/MacOS/OrbStack Helper (VM)' ssh-proxy-fdpass + ProxyUseFdpass yes + */ }; }; };