procolixVm -> fediversityVm

infra/common/nixos/networking.nix

@@ -12,8 +12,8 @@ in
     };
 
     networking = {
-      hostName = config.procolixVm.name;
-      domain = config.procolixVm.domain;
+      hostName = config.fediversityVm.name;
+      domain = config.fediversityVm.domain;
 
       ## REVIEW: Do we actually need that, considering that we have static IPs?
       useDHCP = mkDefault true;
@@ -23,14 +23,14 @@ in
           ipv4 = {
             addresses = [
               {
-                inherit (config.procolixVm.ipv4) address prefixLength;
+                inherit (config.fediversityVm.ipv4) address prefixLength;
               }
             ];
           };
           ipv6 = {
             addresses = [
               {
-                inherit (config.procolixVm.ipv6) address prefixLength;
+                inherit (config.fediversityVm.ipv6) address prefixLength;
               }
             ];
           };
@@ -38,11 +38,11 @@ in
       };
 
       defaultGateway = {
-        address = config.procolixVm.ipv4.gateway;
+        address = config.fediversityVm.ipv4.gateway;
         interface = "eth0";
       };
       defaultGateway6 = {
-        address = config.procolixVm.ipv6.gateway;
+        address = config.fediversityVm.ipv6.gateway;
         interface = "eth0";
       };
 

infra/common/options.nix

@@ -5,7 +5,7 @@ let
 
 in
 {
-  options.procolixVm = {
+  options.fediversityVm = {
     name = mkOption {
       description = ''
         The name of the machine. Most of the time, this will look like `vm02XXX`

infra/common/resource.nix

@@ -13,14 +13,14 @@ let
   secretsPrefix = ../../secrets;
   secrets = import (secretsPrefix + "/secrets.nix");
   keys = import ../../keys;
-  hostPublicKey = keys.systems.${config.procolixVm.name};
+  hostPublicKey = keys.systems.${config.fediversityVm.name};
 
 in
 {
   imports = [ ./options.nix ];
 
   ssh = {
-    host = config.procolixVm.ipv4.address;
+    host = config.fediversityVm.ipv4.address;
     hostPublicKey = hostPublicKey;
   };
 
@@ -39,7 +39,7 @@ in
 
     ## Inject the shared options from the resource's `config` into the NixOS
     ## configuration.
-    procolixVm = config.procolixVm;
+    fediversityVm = config.fediversityVm;
 
     ## Read all the secrets, filter the ones that are supposed to be readable
     ## with this host's public key, and add them correctly to the configuration

infra/fedi300/default.nix

@@ -1,5 +1,5 @@
 {
-  procolixVm = {
+  fediversityVm = {
     domain = "fediversity.eu";
 
     ipv4 = {

infra/flake-part.nix

@@ -23,7 +23,7 @@ let
       ./common/resource.nix
       (./. + "/${vmName}")
     ];
-    procolixVm.name = vmName;
+    fediversityVm.name = vmName;
   };
 
   makeDeployments = mapAttrs (

infra/vm02116/default.nix

@@ -1,5 +1,5 @@
 {
-  procolixVm = {
+  fediversityVm = {
     ipv4.address = "185.206.232.34";
     ipv6.address = "2a00:51c0:12:1201::20";
   };

infra/vm02179/default.nix

@@ -1,5 +1,5 @@
 {
-  procolixVm = {
+  fediversityVm = {
     ipv4.address = "185.206.232.179";
     ipv6.address = "2a00:51c0:12:1201::179";
   };

infra/vm02186/default.nix

@@ -1,5 +1,5 @@
 {
-  procolixVm = {
+  fediversityVm = {
     ipv4.address = "185.206.232.186";
     ipv6.address = "2a00:51c0:12:1201::186";
   };

infra/vm02187/default.nix

@@ -1,5 +1,5 @@
 {
-  procolixVm = {
+  fediversityVm = {
     ipv4.address = "185.206.232.187";
     ipv6.address = "2a00:51c0:12:1201::187";
   };