fix: update deploy-rs usage and nix version for mirai and related systems

Author: uttarayan21

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";

deploy.nix

@@ -1,38 +1,39 @@
 {
   inputs,
   self,
+  deploy-rs,
   ...
 }: {
   nodes = {
     mirai = {
       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";
       };
     };
     tsuba = {
       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";
       };
     };
     ryu = {
       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";
       };
     };
     tako = {
       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,15 +51,15 @@
     #   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";
     #   };
     # };
     # deck = {
     #   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";
     #   };
     # };

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 (

home/programs/default.nix

@@ -65,7 +65,7 @@
       bottom
       btop
       cachix
-      deploy-rs
+      deploy-rs.deploy-rs
       dust
       fd
       file

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;
   };
 

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

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;
   };
 

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