flake.nix

@@ -103,10 +103,5 @@
       (mkHost "nextcloud" {
         suite = "server/lxc";
       })
-
-      # VM for managing server flock.
-      (mkHost "ornithologist" {
-        suite = "server/vm";
-      })
     ];
 }

helpers.nix

@@ -53,8 +53,7 @@ with inputs.nixpkgs.lib; {
         })
       ];
     };
-  in
+  in {
-    {
     nixosConfigurations.${hostname} = nixosSystem {
       inherit system pkgs;
 
@@ -100,9 +99,8 @@ with inputs.nixpkgs.lib; {
         ++ optionals (docker == true) [./suites/server/docker] # Enable docker if required.
         ++ (filesystem.listFilesRecursive ./modules); # Custom modules.
     };
-    }
+
-    // optionalAttrs (strings.hasPrefix "server" suite) {
+    deploy.nodes.${hostname} = mkIf (strings.hasPrefix "server" suite) {
-      deploy.nodes.${hostname} = {
       hostname = "${hostname}.local";
       profiles.system = {
         user = "root";

hosts/muskduck/default.nix

@@ -39,9 +39,6 @@ with lib; {
     ];
   };
 
-  # Allow emulating aarch64 to build for Raspberry Pi.
-  boot.binfmt.emulatedSystems = ["aarch64-linux"];
-
   # Share Music dir.
   services.samba = {
     enable = true;

hosts/ornithologist/default.nix

@@ -1,7 +0,0 @@
-{pkgs, ...}: {
-  # Allow emulating aarch64 to build for Raspberry Pi.
-  boot.binfmt.emulatedSystems = ["aarch64-linux"];
-
-  # Install some packages.
-  environment.systemPackages = with pkgs; [deploy-rs];
-}

suites/desktop/default.nix

@@ -26,6 +26,9 @@ with lib; {
       "udev.log_priority=3"
       "rd.systemd.show_status=auto"
     ];
+
+    # Allow emulating aarch64 to build for Raspberry Pi.
+    binfmt.emulatedSystems = ["aarch64-linux"];
   };
 
   # Enable smart card support (for YubiKey).