diff --git a/systems/renko.nix b/systems/renko.nix index 9153a5b7..10798170 100644 --- a/systems/renko.nix +++ b/systems/renko.nix @@ -40,6 +40,8 @@ _: let nixpkgs.hostPlatform = mkDefault "aarch64-linux"; + boot.kernelPackages = pkgs.linuxKernel.kernels.linux_6_3 + system.stateVersion = "22.11"; security.sudo.extraRules = [ diff --git a/systems/sumireko.nix b/systems/sumireko.nix index a4730e9b..777cd3a6 100644 --- a/systems/sumireko.nix +++ b/systems/sumireko.nix @@ -17,22 +17,24 @@ _: let home-manager.users.root.programs.ssh = { enable = true; extraConfig = '' - Host renko + Host orb HostName 127.0.0.1 Port 32222 - User kat + 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 ''; }; nix.buildMachines = [ { - hostName = "renko"; + hostName = "nixos@orb"; system = "aarch64-linux"; supportedFeatures = ["nixos-test" "benchmark" "big-parallel" "kvm"]; } { - hostName = "renko"; + hostName = "nixos@orb"; system = "x86_64-linux"; supportedFeatures = ["nixos-test" "benchmark" "big-parallel" "kvm"]; } @@ -75,11 +77,13 @@ _: let ssh = { enable = true; extraConfig = '' - Host renko + Host orb HostName 127.0.0.1 Port 32222 - User kat + 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 ''; }; };