diff --git a/config/hardware/lambda.nix b/config/hardware/lambda.nix index 0a4845f..97a4d2a 100644 --- a/config/hardware/lambda.nix +++ b/config/hardware/lambda.nix @@ -48,16 +48,16 @@ networking = { macvlans = { - extif0 = { + intif0 = { interface = "enp3s0f1"; mode = "bridge"; }; }; interfaces = { - extif0 = { - # output of: echo lambda-extif0|md5sum|sed 's/^\(..\)\(..\)\(..\)\(..\)\(..\).*$/02:\1:\2:\3:\4:\5/' - macAddress = "02:27:fe:1c:3c:6e"; + intif0 = { + # output of: echo lambda-intif0|md5sum|sed 's/^\(..\)\(..\)\(..\)\(..\)\(..\).*$/02:\1:\2:\3:\4:\5/' + macAddress = "02:f5:fe:8c:22:fe"; }; }; }; diff --git a/config/host-config/lambda.nix b/config/host-config/lambda.nix index 90349aa..d630aa7 100644 --- a/config/host-config/lambda.nix +++ b/config/host-config/lambda.nix @@ -1,8 +1,11 @@ { config, lib, pkgs, ... }: -let primary-ip = "10.0.0.3"; - -in { +{ + # TODO: remove? + nixpkgs.config.permittedInsecurePackages = [ + "openssh-with-gssapi-8.4p1" # CVE-2021-28041 + ]; + fudo.slynk.enable = true; networking = { @@ -12,12 +15,8 @@ in { enp4s0f0.useDHCP = false; enp4s0f1.useDHCP = false; - extif0 = { - useDHCP = false; - ipv4.addresses = [{ - address = primary-ip; - prefixLength = 22; - }]; + intif0 = { + useDHCP = true; }; }; }; @@ -25,7 +24,7 @@ in { fudo.ipfs = { enable = true; users = [ "niten" ]; - api-address = "/ip4/${primary-ip}/tcp/5001"; + api-address = "/ip4/0.0.0.0/tcp/5001"; }; # TODO: add camera diff --git a/config/networks/sea.fudo.org.nix b/config/networks/sea.fudo.org.nix index 3a3ec29..844804d 100644 --- a/config/networks/sea.fudo.org.nix +++ b/config/networks/sea.fudo.org.nix @@ -68,20 +68,8 @@ in { hosts = { limina = { - ip-address = "10.0.0.6"; - mac-address = "02:fd:79:94:a2:a8"; - }; - nostromo = { ip-address = "10.0.0.1"; - mac-address = "46:54:76:06:f1:10"; - }; - lm = { - ip-address = "10.0.0.2"; - mac-address = "00:23:7d:e6:d9:ea"; - }; - lambda = { - ip-address = "10.0.0.3"; - mac-address = "02:27:fe:1c:3c:6e"; + mac-address = "02:fd:79:94:a2:a8"; }; switch-master = { ip-address = "10.0.0.5"; @@ -90,6 +78,14 @@ in { google-wifi = { ip-address = "10.0.0.7"; mac-address = "7C:D9:5C:9F:6F:E9"; + }; + nostromo = { + ip-address = "10.0.0.10"; + mac-address = "46:54:76:06:f1:10"; + }; + lambda = { + ip-address = "10.0.0.11"; + mac-address = "02:f5:fe:8c:22:fe"; }; cam-entrance = { ip-address = "10.0.0.31";