From 0f6ee21a356829244ffe9e84a0daf7cf62ce9d4c Mon Sep 17 00:00:00 2001
From: uttarayan21 <email@uttarayan.me>
Date: Fri, 28 Nov 2025 16:30:48 +0530
Subject: [PATCH] fix: update deploy-rs usage and nix version for mirai and
 related systems

---
 builders/mirai.nix            |  2 +-
 deploy.nix                    | 15 ++++++++-------
 flake.nix                     |  3 ++-
 home/programs/default.nix     |  2 +-
 nixos/mirai/configuration.nix |  2 +-
 nixos/ryu/configuration.nix   |  2 +-
 nixos/tako/configuration.nix  |  2 +-
 overlays.nix                  |  1 +
 8 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/builders/mirai.nix b/builders/mirai.nix
index c532dce7..30d05e9b 100644
--- a/builders/mirai.nix
+++ b/builders/mirai.nix
@@ -1,5 +1,5 @@
 {
-  hostName = "sh.darksailor.dev";
+  hostName = "mirai.darksailor.dev";
   sshUser = "remotebuilder";
   systems = ["x86_64-linux" "aarch64-linux"];
   protocol = "ssh-ng";
diff --git a/deploy.nix b/deploy.nix
index a37b7ccf..ab920469 100644
--- a/deploy.nix
+++ b/deploy.nix
@@ -1,6 +1,7 @@
 {
   inputs,
   self,
+  deploy-rs,
   ...
 }: {
   nodes = {
@@ -8,7 +9,7 @@
       hostname = "mirai.darksailor.dev";
       profiles.system = {
         sshUser = "fs0c131y";
-        path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.mirai;
+        path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.mirai;
         user = "root";
       };
     };
@@ -16,7 +17,7 @@
       hostname = "tsuba.darksailor.dev";
       profiles.system = {
         sshUser = "servius";
-        path = inputs.deploy-rs.lib.aarch64-linux.activate.nixos self.nixosConfigurations.tsuba;
+        path = deploy-rs.lib.aarch64-linux.activate.nixos self.nixosConfigurations.tsuba;
         user = "root";
       };
     };
@@ -24,7 +25,7 @@
       hostname = "ryu";
       profiles.system = {
         sshUser = "servius";
-        path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.ryu;
+        path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.ryu;
         user = "root";
       };
     };
@@ -32,7 +33,7 @@
       hostname = "tako.darksailor.dev";
       profiles.system = {
         sshUser = "servius";
-        path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.tako;
+        path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.tako;
         user = "root";
       };
     };
@@ -41,7 +42,7 @@
     #   interactiveSudo = true;
     #   profiles.system = {
     #     sshUser = "fs0c131y";
-    #     path = inputs.deploy-rs.lib.aarch64-darwin.activate.darwin self.darwinConfigurations.kuro;
+    #     path = deploy-rs.lib.aarch64-darwin.activate.darwin self.darwinConfigurations.kuro;
     #     user = "root";
     #   };
     # };
@@ -50,7 +51,7 @@
     #   interactiveSudo = true;
     #   profiles.system = {
     #     sshUser = "servius";
-    #     path = inputs.deploy-rs.lib.aarch64-darwin.activate.darwin self.darwinConfigurations.shiro;
+    #     path = deploy-rs.lib.aarch64-darwin.activate.darwin self.darwinConfigurations.shiro;
     #     user = "root";
     #   };
     # };
@@ -58,7 +59,7 @@
     #   hostname = "steamdeck";
     #   profiles.system = {
     #     sshUser = "deck";
-    #     path = inputs.deploy-rs.lib.x86_64-linux.activate.home-manager self.homeConfigurations.deck;
+    #     path = deploy-rs.lib.x86_64-linux.activate.home-manager self.homeConfigurations.deck;
     #     user = "deck";
     #   };
     # };
diff --git a/flake.nix b/flake.nix
index ed4b9d20..e815630e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -399,7 +399,8 @@
       in {
         tsuba = mkImage nixos.tsuba;
       };
-      deploy = import ./deploy.nix {inherit inputs self;};
+      deploy = import ./deploy.nix {inherit inputs self deploy-rs;};
+      checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib;
       inherit devices;
     }
     // flake-utils.lib.eachDefaultSystem (
diff --git a/home/programs/default.nix b/home/programs/default.nix
index 7752e63e..60f9b18c 100644
--- a/home/programs/default.nix
+++ b/home/programs/default.nix
@@ -65,7 +65,7 @@
       bottom
       btop
       cachix
-      deploy-rs
+      deploy-rs.deploy-rs
       dust
       fd
       file
diff --git a/nixos/mirai/configuration.nix b/nixos/mirai/configuration.nix
index 01e69ad3..707bdef9 100644
--- a/nixos/mirai/configuration.nix
+++ b/nixos/mirai/configuration.nix
@@ -65,7 +65,7 @@
       dates = "daily";
       options = "--delete-older-than 5d";
     };
-    package = pkgs.nixVersions.nix_2_31; # deploy-rs doesn't work with nix >= 2.32
+    package = pkgs.nixVersions.latest; # deploy-rs doesn't work with nix >= 2.32
     distributedBuilds = true;
   };
 
diff --git a/nixos/ryu/configuration.nix b/nixos/ryu/configuration.nix
index 5088ce55..5632e016 100644
--- a/nixos/ryu/configuration.nix
+++ b/nixos/ryu/configuration.nix
@@ -67,7 +67,7 @@
       dates = "daily";
       options = "--delete-older-than +5";
     };
-    package = pkgs.nixVersions.nix_2_31; # deploy-rs doesn't work with nix >= 2.32
+    package = pkgs.nixVersions.latest; # deploy-rs doesn't work with nix >= 2.32
     buildMachines = [
       ../../builders/tako.nix
       ../../builders/mirai.nix
diff --git a/nixos/tako/configuration.nix b/nixos/tako/configuration.nix
index 17b7a8fe..7a38e090 100644
--- a/nixos/tako/configuration.nix
+++ b/nixos/tako/configuration.nix
@@ -65,7 +65,7 @@
       dates = "daily";
       options = "--delete-older-than 5d";
     };
-    package = pkgs.nixVersions.nix_2_31; # deploy-rs doesn't work with nix >= 2.32
+    package = pkgs.nixVersions.latest; # deploy-rs doesn't work with nix >= 2.32
     distributedBuilds = true;
   };
 
diff --git a/overlays.nix b/overlays.nix
index f029d551..740c9a30 100644
--- a/overlays.nix
+++ b/overlays.nix
@@ -278,6 +278,7 @@ in
     anyrun-overlay
     catppuccinThemes
     csshacks
+    inputs.deploy-rs.overlays.default
     inputs.nix-minecraft.overlay
     inputs.nur.overlays.default
     inputs.rust-overlay.overlays.default