stylix: flake output homeManagerModules has been renamed to homeModules and will be removed after 26.05.

aspects/hosts/alexandria.nix

@@ -1,6 +1,7 @@
-{ inputs, ... }:
+{ inputs, self, ... }:
 {
-  flake.nixosConfigurations.alexandria = inputs.nixpkgs-stable.lib.nixosSystem {
+  flake = {
+    nixosConfigurations.alexandria = inputs.nixpkgs-stable.lib.nixosSystem {
       system = "x86_64-linux";
       specialArgs = { inherit inputs; };
       modules = [
@@ -47,4 +48,13 @@
         ./_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,6 +1,7 @@
-{ inputs, ... }:
+{ inputs, self, ... }:
 {
-  flake.nixosConfigurations.io = inputs.nixpkgs.lib.nixosSystem {
+  flake = {
+    nixosConfigurations.io = inputs.nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       specialArgs = { inherit inputs; };
       modules = [
@@ -56,4 +57,14 @@
         ./_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,6 +1,7 @@
-{ inputs, ... }:
+{ inputs, self, ... }:
 {
-  flake.nixosConfigurations.trantor = inputs.nixpkgs-stable.lib.nixosSystem {
+  flake = {
+    nixosConfigurations.trantor = inputs.nixpkgs-stable.lib.nixosSystem {
       system = "aarch64-linux";
       specialArgs = { inherit inputs; };
       modules = [
@@ -51,4 +52,13 @@
         ./_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,13 +1,22 @@
 { ... }:
 {
   flake.modules = {
-    nixos.stylix = { inputs, ... }: {
+    nixos.stylix =
+      { inputs, ... }:
+      {
         imports = [ inputs.stylix.nixosModules.stylix ];
       };
 
-    homeManager.stylix = { config, inputs, pkgs, ... }: {
+    homeManager.stylix =
+      {
+        config,
+        inputs,
+        pkgs,
+        ...
+      }:
+      {
         imports = [
-        inputs.stylix.homeManagerModules.stylix
+          inputs.stylix.homeModules.stylix
           inputs.zen-browser.homeModules.beta
         ];
 

aspects/users/user.nix

@@ -1,4 +1,4 @@
-{ inputs, ... }:
+{ inputs, self, ... }:
 
 {
   flake = {
@@ -114,5 +114,11 @@
         ];
       };
     };
+    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

@@ -1,48 +0,0 @@
-{ 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
-      aspectsModule = import-tree ./aspects;
-      packagesModule = import-tree ./packages;
-      shellsModule = import-tree ./shells;
-      terranixModule = import-tree ./terranix;
+      aspectsModules = import-tree ./aspects;
+      packagesModules = import-tree ./packages;
+      shellsModules = import-tree ./shells;
+      terranixModules = import-tree ./terranix;
     in
     flake-parts.lib.mkFlake { inherit inputs; } {
       systems = [
@@ -68,12 +68,9 @@
         flake-parts.flakeModules.modules
         inputs.terranix.flakeModule
       ]
-      ++ aspectsModule.imports
-      ++ packagesModule.imports
-      ++ shellsModule.imports
-      ++ terranixModule.imports
-      ++ [
-        ./deploy.nix
-      ];
+      ++ aspectsModules.imports
+      ++ packagesModules.imports
+      ++ shellsModules.imports
+      ++ terranixModules.imports;
     };
 }