kat/nixfiles
1
0
Fork 0
mirror of https://github.com/kittywitch/nixfiles.git synced 2026-02-09 04:19:19 -08:00
Code Issues Projects Releases Packages Wiki Activity

Fixups

Browse source
This commit is contained in:
Kat Inskip 2023-07-18 11:57:35 -07:00
parent 26196b3d59
commit 61b95262b8
Signed by: kat
GPG key ID: 465E64DECEA8CF0F
3 changed files with 25 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

14
systems/default.nix
View file

@ -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"];
};
})
];

12
systems/renko.nix
View file

@ -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";

12
systems/sumireko.nix
View file

@ -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
*/
};
};
};