aspects/hosts/alexandria.nix

@@ -1,7 +1,6 @@
-{ inputs, self, ... }:
+{ inputs, ... }:
 {
-  flake = {
+  flake.nixosConfigurations.alexandria = inputs.nixpkgs-stable.lib.nixosSystem {
-    nixosConfigurations.alexandria = inputs.nixpkgs-stable.lib.nixosSystem {
     system = "x86_64-linux";
     specialArgs = { inherit inputs; };
     modules = [
@@ -48,13 +47,4 @@
       ./_alexandria/vaultwarden.nix
     ];
   };
-    deploy.nodes.alexandria = {
-      hostname = "alexandria";
-      profiles.system = {
-        sshUser = "user";
-        path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.alexandria;
-        user = "root";
-      };
-    };
-  };
 }

aspects/hosts/io.nix

@@ -1,7 +1,6 @@
-{ inputs, self, ... }:
+{ inputs, ... }:
 {
-  flake = {
+  flake.nixosConfigurations.io = inputs.nixpkgs.lib.nixosSystem {
-    nixosConfigurations.io = inputs.nixpkgs.lib.nixosSystem {
     system = "x86_64-linux";
     specialArgs = { inherit inputs; };
     modules = [
@@ -57,14 +56,4 @@
       ./_io/services.nix
     ];
   };
-    deploy.nodes.io = {
-      hostname = "io";
-      profiles.system = {
-        sshUser = "user";
-        path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.io;
-        user = "root";
-        remoteBuild = false;
-      };
-    };
-  };
 }

aspects/hosts/trantor.nix

@@ -1,7 +1,6 @@
-{ inputs, self, ... }:
+{ inputs, ... }:
 {
-  flake = {
+  flake.nixosConfigurations.trantor = inputs.nixpkgs-stable.lib.nixosSystem {
-    nixosConfigurations.trantor = inputs.nixpkgs-stable.lib.nixosSystem {
     system = "aarch64-linux";
     specialArgs = { inherit inputs; };
     modules = [
@@ -52,13 +51,4 @@
       ./_trantor/unbound.nix
     ];
   };
-    deploy.nodes.trantor = {
-      hostname = "trantor";
-      profiles.system = {
-        sshUser = "user";
-        path = inputs.deploy-rs.lib.aarch64-linux.activate.nixos self.nixosConfigurations.trantor;
-        user = "root";
-      };
-    };
-  };
 }

aspects/stylix.nix

@@ -1,22 +1,13 @@
 { ... }:
 {
   flake.modules = {
-    nixos.stylix =
+    nixos.stylix = { inputs, ... }: {
-      { inputs, ... }:
-      {
       imports = [ inputs.stylix.nixosModules.stylix ];
     };
 
-    homeManager.stylix =
+    homeManager.stylix = { config, inputs, pkgs, ... }: {
-      {
-        config,
-        inputs,
-        pkgs,
-        ...
-      }:
-      {
       imports = [
-          inputs.stylix.homeModules.stylix
+        inputs.stylix.homeManagerModules.stylix
         inputs.zen-browser.homeModules.beta
       ];
 

aspects/users/user.nix

@@ -1,4 +1,4 @@
-{ inputs, self, ... }:
+{ inputs, ... }:
 
 {
   flake = {
@@ -114,11 +114,5 @@
         ];
       };
     };
-    deploy.nodes.io.profiles.user = {
-      sshUser = "user";
-      path = inputs.deploy-rs.lib.x86_64-linux.activate.home-manager self.homeConfigurations."user@io";
-      user = "user";
-      remoteBuild = false;
-    };
   };
 }

deploy.nix

@@ -0,0 +1,48 @@
+{ inputs, self, ... }:
+{
+  flake.deploy = {
+    remoteBuild = true;
+    nodes = {
+      alexandria = {
+        hostname = "alexandria";
+        profiles.system = {
+          sshUser = "user";
+          path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.alexandria;
+          user = "root";
+        };
+      };
+
+      trantor = {
+        hostname = "trantor";
+        profiles.system = {
+          sshUser = "user";
+          path = inputs.deploy-rs.lib.aarch64-linux.activate.nixos self.nixosConfigurations.trantor;
+          user = "root";
+        };
+      };
+
+      io = {
+        hostname = "io";
+        profiles = {
+          system = {
+            sshUser = "user";
+            path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.io;
+            user = "root";
+            remoteBuild = false;
+          };
+          user = {
+            sshUser = "user";
+            path = inputs.deploy-rs.lib.x86_64-linux.activate.home-manager self.homeConfigurations."user@io";
+            user = "user";
+            remoteBuild = false;
+          };
+        };
+      };
+    };
+  };
+  perSystem =
+    { system, ... }:
+    {
+      checks = inputs.deploy-rs.lib.${system}.deployChecks self.deploy;
+    };
+}

flake.nix

@@ -53,10 +53,10 @@
   outputs =
     inputs@{ flake-parts, import-tree, ... }:
     let
-      aspectsModules = import-tree ./aspects;
+      aspectsModule = import-tree ./aspects;
-      packagesModules = import-tree ./packages;
+      packagesModule = import-tree ./packages;
-      shellsModules = import-tree ./shells;
+      shellsModule = import-tree ./shells;
-      terranixModules = import-tree ./terranix;
+      terranixModule = import-tree ./terranix;
     in
     flake-parts.lib.mkFlake { inherit inputs; } {
       systems = [
@@ -68,9 +68,12 @@
         flake-parts.flakeModules.modules
         inputs.terranix.flakeModule
       ]
-      ++ aspectsModules.imports
+      ++ aspectsModule.imports
-      ++ packagesModules.imports
+      ++ packagesModule.imports
-      ++ shellsModules.imports
+      ++ shellsModule.imports
-      ++ terranixModules.imports;
+      ++ terranixModule.imports
+      ++ [
+        ./deploy.nix
+      ];
     };
 }