flake.nix

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

helpers.nix

@@ -12,14 +12,13 @@ with inputs.nixpkgs.lib; {
     suite ? "",
     docker ? false,
     hostModules ? [],
-  }: let
-    # Secrets directory.
-    secrets = builtins.toString inputs.secrets;
-
+  }:
+    {
+      nixosConfigurations.${hostname} = nixosSystem rec {
         # Architecture.
         system = platform;
 
-    # Stable nixpkgs with overlay.
+        # nixpkgs config.
         pkgs = import nixpkgs {
           inherit system;
 
@@ -39,27 +38,12 @@ with inputs.nixpkgs.lib; {
           ];
         };
 
-    # deploy-rs.
-    deployPkgs = import nixpkgs {
-      inherit system;
-
-      overlays = [
-        deploy-rs.overlays.default
-        (self: super: {
-          deploy-rs = {
-            inherit (pkgs) deploy-rs;
-            lib = super.deploy-rs.lib;
-          };
-        })
-      ];
-    };
-  in {
-    nixosConfigurations.${hostname} = nixosSystem {
-      inherit system pkgs;
-
         specialArgs = {
-        # Pass variables to config.
-        inherit inputs secrets hostname;
+          # Pass hostname & inputs to config.
+          inherit inputs hostname;
+
+          # Secrets directory.
+          secrets = builtins.toString inputs.secrets;
         };
 
         modules =
@@ -99,8 +83,22 @@ with inputs.nixpkgs.lib; {
           ++ optionals (docker == true) [./suites/server/docker] # Enable docker if required.
           ++ (filesystem.listFilesRecursive ./modules); # Custom modules.
       };
-
-    deploy.nodes.${hostname} = mkIf (strings.hasPrefix "server" suite) {
+    }
+    // optionalAttrs (strings.hasPrefix "server" suite) {
+      deploy.nodes.${hostname} = let
+        deployPkgs = import nixpkgs {
+          inherit system;
+          overlays = [
+            deploy-rs.overlays.default
+            (self: super: {
+              deploy-rs = {
+                inherit (pkgs) deploy-rs;
+                lib = super.deploy-rs.lib;
+              };
+            })
+          ];
+        };
+      in {
         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).