servius/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: update deploy-rs usage and nix version for mirai and related systems
Some checks failed
Flake checker / Build Nix targets (push) Has been cancelled
Details

Browse Source
This commit is contained in:
uttarayan21
2025-11-28 16:30:48 +05:30
parent 1e3e314411
commit 0f6ee21a35
8 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builders/mirai.nix
View File

@@ -1,5 +1,5 @@
{ {
hostName = "sh.darksailor.dev"; hostName = "mirai.darksailor.dev";
sshUser = "remotebuilder"; sshUser = "remotebuilder";
systems = ["x86_64-linux" "aarch64-linux"]; systems = ["x86_64-linux" "aarch64-linux"];
protocol = "ssh-ng"; protocol = "ssh-ng";

15
deploy.nix
View File

@@ -1,6 +1,7 @@
{ {
inputs, inputs,
self, self,
deploy-rs,
... ...
}: { }: {
nodes = { nodes = {
@@ -8,7 +9,7 @@
hostname = "mirai.darksailor.dev"; hostname = "mirai.darksailor.dev";
profiles.system = { profiles.system = {
sshUser = "fs0c131y"; 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"; user = "root";
}; };
}; };
@@ -16,7 +17,7 @@
hostname = "tsuba.darksailor.dev"; hostname = "tsuba.darksailor.dev";
profiles.system = { profiles.system = {
sshUser = "servius"; 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"; user = "root";
}; };
}; };
@@ -24,7 +25,7 @@
hostname = "ryu"; hostname = "ryu";
profiles.system = { profiles.system = {
sshUser = "servius"; 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"; user = "root";
}; };
}; };
@@ -32,7 +33,7 @@
hostname = "tako.darksailor.dev"; hostname = "tako.darksailor.dev";
profiles.system = { profiles.system = {
sshUser = "servius"; 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"; user = "root";
}; };
}; };
@@ -41,7 +42,7 @@
# interactiveSudo = true; # interactiveSudo = true;
# profiles.system = { # profiles.system = {
# sshUser = "fs0c131y"; # 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"; # user = "root";
# }; # };
# }; # };
@@ -50,7 +51,7 @@
# interactiveSudo = true; # interactiveSudo = true;
# profiles.system = { # profiles.system = {
# sshUser = "servius"; # 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"; # user = "root";
# }; # };
# }; # };
@@ -58,7 +59,7 @@
# hostname = "steamdeck"; # hostname = "steamdeck";
# profiles.system = { # profiles.system = {
# sshUser = "deck"; # 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"; # user = "deck";
# }; # };
# }; # };

3
flake.nix
View File

@@ -399,7 +399,8 @@
in { in {
tsuba = mkImage nixos.tsuba; 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; inherit devices;
} }
// flake-utils.lib.eachDefaultSystem ( // flake-utils.lib.eachDefaultSystem (

2
home/programs/default.nix
View File

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

2
nixos/mirai/configuration.nix
View File

@@ -65,7 +65,7 @@
dates = "daily"; dates = "daily";
options = "--delete-older-than 5d"; 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; distributedBuilds = true;
}; };

2
nixos/ryu/configuration.nix
View File

@@ -67,7 +67,7 @@
dates = "daily"; dates = "daily";
options = "--delete-older-than +5"; 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 = [ buildMachines = [
../../builders/tako.nix ../../builders/tako.nix
../../builders/mirai.nix ../../builders/mirai.nix

2
nixos/tako/configuration.nix
View File

@@ -65,7 +65,7 @@
dates = "daily"; dates = "daily";
options = "--delete-older-than 5d"; 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; distributedBuilds = true;
}; };

1
overlays.nix
View File

@@ -278,6 +278,7 @@ in
anyrun-overlay anyrun-overlay
catppuccinThemes catppuccinThemes
csshacks csshacks
inputs.deploy-rs.overlays.default
inputs.nix-minecraft.overlay inputs.nix-minecraft.overlay
inputs.nur.overlays.default inputs.nur.overlays.default
inputs.rust-overlay.overlays.default inputs.rust-overlay.overlays.default