diff --git a/nixos/machines/ghatanothoa/configuration.nix b/nixos/machines/ghatanothoa/configuration.nix index 8364bea..207e37f 100644 --- a/nixos/machines/ghatanothoa/configuration.nix +++ b/nixos/machines/ghatanothoa/configuration.nix @@ -4,7 +4,7 @@ ../../modules/jitsi.nix ../../roles ../../roles/vm.nix - ../../modules/vmNetwork.nix + ./network.nix ]; services.mathebau-jitsi = { @@ -14,6 +14,5 @@ # System configuration here networking.hostName = "ghatanothoa"; - vmNetwork.ipv4 = "192.168.0.25"; system.stateVersion = "23.11"; } diff --git a/nixos/machines/ghatanothoa/network.nix b/nixos/machines/ghatanothoa/network.nix new file mode 100644 index 0000000..2a1f4ae --- /dev/null +++ b/nixos/machines/ghatanothoa/network.nix @@ -0,0 +1,16 @@ +# We sohuld put that config somewhere in roles and give it a parameter or something, +# everyone gets the same nameserver and the same prefixLength and address vs defaultGateway alsways +# depend on the same thing +{ + imports = []; + networking = { + interfaces.enX0.ipv4.addresses = [ + { + address = "192.168.0.25"; + prefixLength = 16; + } + ]; + defaultGateway = "192.168.0.152"; + nameservers = ["130.83.2.22" "130.83.56.60" "130.83.22.60" "130.82.22.63"]; + }; +} diff --git a/nixos/machines/lobon/configuration.nix b/nixos/machines/lobon/configuration.nix index 506d637..10948c0 100644 --- a/nixos/machines/lobon/configuration.nix +++ b/nixos/machines/lobon/configuration.nix @@ -4,7 +4,7 @@ ../../modules/mailman.nix ../../roles ../../roles/vm.nix - ../../modules/vmNetwork.nix + ./network.nix ]; # System configuration here @@ -16,7 +16,6 @@ }; networking.hostName = "lobon"; - vmNetwork.ipv4 = "192.168.0.22"; system.stateVersion = "23.11"; sops.secrets = { diff --git a/nixos/machines/lobon/network.nix b/nixos/machines/lobon/network.nix new file mode 100644 index 0000000..23ad3e8 --- /dev/null +++ b/nixos/machines/lobon/network.nix @@ -0,0 +1,16 @@ +# We sohuld put that config somewhere in roles and give it a parameter or something, +# everyone gets the same nameserver and the same prefixLength and address vs defaultGateway alsways +# depend on the same thing +{ + imports = []; + networking = { + interfaces.enX0.ipv4.addresses = [ + { + address = "192.168.0.22"; + prefixLength = 16; + } + ]; + defaultGateway = "192.168.0.149"; + nameservers = ["130.83.2.22" "130.83.56.60" "130.83.22.60" "130.82.22.63"]; + }; +} diff --git a/nixos/modules/vmNetwork.nix b/nixos/modules/vmNetwork.nix deleted file mode 100644 index 133d101..0000000 --- a/nixos/modules/vmNetwork.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - lib, - config, - ... -}: let - inherit - (lib) - mkOption - types - last - init - ; - inherit - (lib.strings) - splitString - concatStringsSep - toInt - ; - cfg = config.vmNetwork; -in { - imports = []; - - options.vmNetwork = { - ipv4 = mkOption { - type = types.str; - description = "the ipv4 adress of this machine"; - }; - }; - - config = { - networking = { - interfaces.enX0.ipv4.addresses = [ - { - address = cfg.ipv4; - prefixLength = 16; - } - ]; - defaultGateway = let - addr = splitString "." cfg.ipv4; - addrInit = init addr; - addrLastInt = builtins.toString (toInt (last addr) + 127); - in - concatStringsSep "." (addrInit ++ [addrLastInt]); - # https://www.hrz.tu-darmstadt.de/services/it_services/nameserver_dns/index.de.jsp - nameservers = ["130.83.22.63" "130.83.22.60" "130.83.56.60"]; - }; - }; -}