From d41168c1bea15143f15e2c902a53bfec95a2b3e9 Mon Sep 17 00:00:00 2001
From: uttarayan21 <email@uttarayan.me>
Date: Fri, 3 Jan 2025 00:50:58 +0530
Subject: [PATCH] feat: Move deploy nodes to a different file

---
 deploy.nix | 86 ++++++++++++++++++++++++++++++------------------------
 flake.nix  | 45 +---------------------------
 2 files changed, 49 insertions(+), 82 deletions(-)

diff --git a/deploy.nix b/deploy.nix
index 709a4697..8840d5f2 100644
--- a/deploy.nix
+++ b/deploy.nix
@@ -1,38 +1,48 @@
-# {
-#   devices,
-#   inputs,
-#   deploy-rs,
-# }: {
-#   mkNode = {
-#     device,
-#     target,
-#     config,
-#   }: {
-#     hostname = device.name;
-#     profiles.system = {
-#       user = device.user;
-#       path = deploy-rs.lib.${device.system}.activate.${target} config;
-#     };
-#   };
-#   nodes-x86_64-linux = builtins.map (device:
-#     mkNode {
-#       device = device;
-#       target = "nixos";
-#       config = self.nixosConfigurations.${device.name};
-#     })
-#   nixos_devices;
-#   nodes-aarch64-darwin = builtins.map (device:
-#     mkNode {
-#       device = device;
-#       target = "darwin";
-#       config = self.darwinConfigurations.${device.name};
-#     });
-#   deploy = {
-#     nodes = nodes-x86_64-linux ++ nodes-aarch64-darwin;
-#   };
-#
-#   # checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib;
-#   # checks = {
-#   #   x86_64-linux = deploy-rs.lib.x86_64-linux.deployChecks self.deploy;
-#   # };
-# }
+{
+  inputs,
+  self,
+  ...
+}: {
+  nodes = {
+    mirai = {
+      hostname = "mirai";
+      profiles.system = {
+        sshUser = "fs0c131y";
+        path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.mirai;
+        user = "root";
+      };
+    };
+    ryu = {
+      hostname = "ryu";
+      profiles.system = {
+        sshUser = "servius";
+        path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.ryu;
+        user = "root";
+      };
+    };
+    kuro = {
+      hostname = "kuro";
+      profiles.system = {
+        sshUser = "fs0c131y";
+        path = inputs.deploy-rs.lib.aarch64-darwin.activate.darwin self.darwinConfigurations.kuro;
+        user = "root";
+      };
+    };
+    deoxys = {
+      hostname = "deoxys";
+      profiles.system = {
+        sshUser = "servius";
+        path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.deoxys;
+        user = "root";
+      };
+    };
+    deck = {
+      hostname = "deck";
+      profiles.system = {
+        sshUser = "deck";
+        path = inputs.deploy-rs.lib.x86_64-linux.activate.home-manager self.homeConfigurations.deck;
+        user = "deck";
+      };
+    };
+  };
+}
diff --git a/flake.nix b/flake.nix
index e66d8650..5495809f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -273,50 +273,7 @@
             };
         };
 
-      deploy = {
-        nodes = {
-          mirai = {
-            hostname = "mirai";
-            profiles.system = {
-              sshUser = "fs0c131y";
-              path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.mirai;
-              user = "root";
-            };
-          };
-          ryu = {
-            hostname = "ryu";
-            profiles.system = {
-              sshUser = "servius";
-              path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.ryu;
-              user = "root";
-            };
-          };
-          kuro = {
-            hostname = "kuro";
-            profiles.system = {
-              sshUser = "fs0c131y";
-              path = inputs.deploy-rs.lib.aarch64-darwin.activate.darwin self.darwinConfigurations.kuro;
-              user = "root";
-            };
-          };
-          deoxys = {
-            hostname = "deoxys";
-            profiles.system = {
-              sshUser = "servius";
-              path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.deoxys;
-              user = "root";
-            };
-          };
-          deck = {
-            hostname = "deck";
-            profiles.system = {
-              sshUser = "deck";
-              path = inputs.deploy-rs.lib.x86_64-linux.activate.home-manager self.homeConfigurations.deck;
-              user = "deck";
-            };
-          };
-        };
-      };
+      deploy = import ./deploy.nix {inherit inputs self;};
     }
     // flake-utils.lib.eachDefaultSystem (
       system: let