diff --git a/flake.nix b/flake.nix index 85f4454..58af87f 100644 --- a/flake.nix +++ b/flake.nix @@ -51,6 +51,11 @@ specialArgs = inputs; modules = [ ./hosts/vm/livre ] ++ baseModules; }; + + mediakiwi = nixosSystem { + specialArgs = inputs; + modules = [ ./hosts/vm/medakiwi ] ++ baseModules; + }; neo = nixosSystem { specialArgs = inputs; @@ -71,11 +76,6 @@ specialArgs = inputs; modules = [ ./hosts/vm/two ] ++ baseModules; }; - - wiki = nixosSystem { - specialArgs = inputs; - modules = [ ./hosts/vm/wiki ] ++ baseModules; - }; }; }; diff --git a/hosts/vm/wiki/default.nix b/hosts/vm/mediakiwi/default.nix similarity index 78% rename from hosts/vm/wiki/default.nix rename to hosts/vm/mediakiwi/default.nix index f4baa1a..44ee90d 100644 --- a/hosts/vm/wiki/default.nix +++ b/hosts/vm/mediakiwi/default.nix @@ -3,13 +3,13 @@ { imports = [ ./hardware-configuration.nix - # ./networking.nix + ./networking.nix ../../../modules ../../../modules/services/wiki.nix ]; - networking.hostName = "wiki"; + networking.hostName = "mediakiwi"; boot.loader.grub.devices = [ "/dev/sda" ]; system.stateVersion = "25.05"; diff --git a/hosts/vm/wiki/hardware-configuration.nix b/hosts/vm/mediakiwi/hardware-configuration.nix similarity index 100% rename from hosts/vm/wiki/hardware-configuration.nix rename to hosts/vm/mediakiwi/hardware-configuration.nix diff --git a/hosts/vm/mediakiwi/networking.nix b/hosts/vm/mediakiwi/networking.nix new file mode 100644 index 0000000..d4accf4 --- /dev/null +++ b/hosts/vm/mediakiwi/networking.nix @@ -0,0 +1,29 @@ +{ ... }: + +{ + networking = { + interfaces = { + ens18 = { + + ipv4 = { + addresses = [ + { + address = "172.16.10.144"; + prefixLength = 24; + } + ]; + }; + + ipv6 = { + addresses = [ + { + address = "fd00::10:0:ff:fe01:4410"; + prefixLength = 64; + } + ]; + }; + + }; + }; + }; +} diff --git a/hosts/vm/wiki/networking.nix b/hosts/vm/wiki/networking.nix deleted file mode 100644 index 8ec9ca3..0000000 --- a/hosts/vm/wiki/networking.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ ... }: - -{ - networking = { - interfaces = { - ens18 = { - - ipv4 = { - addresses = [ - { - address = "172.16.10.139"; - prefixLength = 24; - } - ]; - }; - - ipv6 = { - addresses = [ - { - address = "fd00::10:0:ff:fe01:3910"; - prefixLength = 64; - } - ]; - }; - - }; - - ens19 = { - - ipv4 = { - addresses = [ - { - address = "172.16.3.139"; - prefixLength = 24; - } - ]; - routes = [ - { - address = "0.0.0.0"; - via = "172.16.3.99"; - prefixLength = 0; - } - ]; - }; - - ipv6 = { - addresses = [ - { - address = "2a0c:700:3::ff:fe01:3903"; - prefixLength = 64; - } - ]; - routes = [ - { - address = "::"; - via = "2a0c:700:3::ff:fe00:9903"; - prefixLength = 0; - } - ]; - }; - - }; - }; - }; -}