systems -> machines

configs/packages.nix

@@ -123,7 +123,7 @@ in
     zoom-us # video conferencing
     (pkgs.writers.writeDashBin "im" ''
       weechat_password=$(${pkgs.pass}/bin/pass weechat)
-      exec ${weechat}/bin/weechat -t -r '/mouse enable; /remote add makanek http://${pkgs.lib.niveum.systems.makanek.externalIp}:8002 -password='"$weechat_password"'; /remote connect makanek'
+      exec ${weechat}/bin/weechat -t -r '/mouse enable; /remote add makanek http://${pkgs.lib.niveum.machines.makanek.externalIp}:8002 -password='"$weechat_password"'; /remote connect makanek'
     '')
     alejandra # nix formatter
     pdfgrep # search in pdf

configs/sshd.nix

@@ -8,7 +8,7 @@
 
   services.openssh = {
     enable = true;
-    ports = [ pkgs.lib.niveum.systems.${config.networking.hostName}.sshPort ];
+    ports = [ pkgs.lib.niveum.machines.${config.networking.hostName}.sshPort ];
     settings = {
       PasswordAuthentication = false;
       X11Forwarding = true;

flake.nix

@@ -92,7 +92,7 @@
               map (
                 hostname:
                 let
-                  niveumSystems = import lib/systems.nix;
+                  machines = import lib/machines.nix;
                   systemAddresses =
                     system:
                     lib.optionals (system ? "internalIp") [ system.internalIp ]
@@ -105,7 +105,7 @@
                   addresses = lib.listToAttrs (
                     map (name: {
                       inherit name;
-                      value = systemAddresses (niveumSystems.${hostname});
+                      value = systemAddresses (machines.${hostname});
                     }) (builtins.attrNames self.nixosConfigurations)
                   );
                   deployScript = pkgs.writers.writeBash "deploy-${hostname}" ''
@@ -115,7 +115,7 @@
                     )
                     for target in "''${targets[@]}"; do
                       nc -z -w 2 "$(echo $target | cut -d'@' -f2)" ${
-                        toString niveumSystems.${hostname}.sshPort
+                        toString machines.${hostname}.sshPort
                       } && reachable_target=$target && break
                     done
                     if [ -z "$reachable_target" ]; then
@@ -123,13 +123,13 @@
                       exit 1
                     fi
                     echo "Deploying to ${hostname} via $reachable_target"
-                    export NIX_SSHOPTS='-p ${toString niveumSystems.${hostname}.sshPort}'
+                    export NIX_SSHOPTS='-p ${toString machines.${hostname}.sshPort}'
                     ${pkgs.nixos-rebuild}/bin/nixos-rebuild switch \
                       --max-jobs 2 \
                       --log-format internal-json \
                       --flake .#${hostname} \
                       --target-host "$reachable_target" \
-                      ${lib.optionalString (localSystem != niveumSystems.${hostname}.system) "--build-host $reachable_target"} \
+                      ${lib.optionalString (localSystem != machines.${hostname}.system) "--build-host $reachable_target"} \
                       |& ${pkgs.nix-output-monitor}/bin/nom --json
                   '';
                 in

lib/default.nix

@@ -1,6 +1,6 @@
 { lib, pkgs }:
 let
-  systems = import ./systems.nix;
+  machines = import ./machines.nix;
 in
 {
   tmpfilesConfig =
@@ -70,19 +70,19 @@ in
   };
 
   retiolumAddresses = lib.mapAttrs (_: v: { inherit (v.retiolum) ipv4 ipv6; }) (
-    lib.filterAttrs (_: v: v ? "retiolum") systems
+    lib.filterAttrs (_: v: v ? "retiolum") machines
   );
   externalNetwork = lib.mapAttrs (_: v: v.externalIp) (
-    lib.filterAttrs (_: v: v ? "externalIp") systems
+    lib.filterAttrs (_: v: v ? "externalIp") machines
   );
   localAddresses = lib.mapAttrs (_: v: v.internalIp) (
-    lib.filterAttrs (_: v: v ? "internalIp") systems
+    lib.filterAttrs (_: v: v ? "internalIp") machines
   );
   myceliumAddresses = lib.mapAttrs (_: v: v.mycelium.ipv6) (
-    lib.filterAttrs (_: v: v ? "mycelium") systems
+    lib.filterAttrs (_: v: v ? "mycelium") machines
   );
   syncthingIds = lib.mapAttrs (_: v: { id = v.syncthingId; }) (
-    lib.filterAttrs (_: v: v ? "syncthingId") systems
+    lib.filterAttrs (_: v: v ? "syncthingId") machines
   );
 
   email =
@@ -102,7 +102,7 @@ in
       };
     };
 
-  systems = systems;
+  machines = machines;
 
   kieran = {
     github = "kmein";
@@ -120,9 +120,9 @@ in
       "सः"
     ];
     sshKeys = [
-      systems.fatteh.sshKey
+      machines.fatteh.sshKey
-      systems.manakish.sshKey
+      machines.manakish.sshKey
-      systems.kabsa.sshKey
+      machines.kabsa.sshKey
     ];
   };