commit 764ba6062da2b01f6d76691810b65e890bd73879
parent a866311a157c1ef8f42fc6ca568d6f4db078b467
Author: mtmn <miro@haravara.org>
Date: Tue, 2 Jun 2026 18:58:50 +0200
chore: deprecate deploy-rs
Diffstat:
6 files changed, 7 insertions(+), 119 deletions(-)
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ nix flake check
nh home switch "<repo-path>"
# Deploy to remote host
-nix run github:serokell/deploy-rs .#<host>
+NH_ELEVATION_STRATEGY=none nh os switch . --hostname <host> --target-host root@<host> --build-host root@<host>
# Update flake.lock
nix flake update
diff --git a/flake.lock b/flake.lock
@@ -8,7 +8,7 @@
"ragenix",
"nixpkgs"
],
- "systems": "systems_3"
+ "systems": "systems_2"
},
"locked": {
"lastModified": 1761656077,
@@ -81,28 +81,6 @@
"type": "github"
}
},
- "deploy-rs": {
- "inputs": {
- "flake-compat": "flake-compat",
- "nixpkgs": [
- "nixpkgs"
- ],
- "utils": "utils"
- },
- "locked": {
- "lastModified": 1770019181,
- "narHash": "sha256-hwsYgDnby50JNVpTRYlF3UR/Rrpt01OrxVuryF40CFY=",
- "owner": "serokell",
- "repo": "deploy-rs",
- "rev": "77c906c0ba56aabdbc72041bf9111b565cdd6171",
- "type": "github"
- },
- "original": {
- "owner": "serokell",
- "repo": "deploy-rs",
- "type": "github"
- }
- },
"disko": {
"inputs": {
"nixpkgs": [
@@ -142,22 +120,6 @@
"type": "github"
}
},
- "flake-compat": {
- "flake": false,
- "locked": {
- "lastModified": 1733328505,
- "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
- "owner": "edolstra",
- "repo": "flake-compat",
- "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
- "type": "github"
- },
- "original": {
- "owner": "edolstra",
- "repo": "flake-compat",
- "type": "github"
- }
- },
"flake-utils": {
"inputs": {
"systems": "systems"
@@ -177,7 +139,7 @@
},
"flake-utils_2": {
"inputs": {
- "systems": "systems_4"
+ "systems": "systems_3"
},
"locked": {
"lastModified": 1731533236,
@@ -344,7 +306,6 @@
"root": {
"inputs": {
"corpus": "corpus",
- "deploy-rs": "deploy-rs",
"disko": "disko",
"home-manager": "home-manager",
"nix-index-database": "nix-index-database",
@@ -436,39 +397,6 @@
"repo": "default",
"type": "github"
}
- },
- "systems_4": {
- "locked": {
- "lastModified": 1681028828,
- "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
- "owner": "nix-systems",
- "repo": "default",
- "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
- "type": "github"
- },
- "original": {
- "owner": "nix-systems",
- "repo": "default",
- "type": "github"
- }
- },
- "utils": {
- "inputs": {
- "systems": "systems_2"
- },
- "locked": {
- "lastModified": 1731533236,
- "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
- }
}
},
"root": "root",
diff --git a/flake.nix b/flake.nix
@@ -14,11 +14,6 @@
inputs.nixpkgs.follows = "nixpkgs";
};
- deploy-rs = {
- url = "github:serokell/deploy-rs";
- inputs.nixpkgs.follows = "nixpkgs";
- };
-
disko = {
url = "github:nix-community/disko";
inputs.nixpkgs.follows = "nixpkgs";
@@ -42,7 +37,6 @@
self,
home-manager,
nixpkgs,
- deploy-rs,
disko,
...
} @ inputs: let
@@ -96,35 +90,6 @@
))
user.configs)
configData.users;
-
- deployNodes =
- lib.mapAttrs (hostName: host: let
- username = host.username or defaultUsername;
- in {
- hostname = host.hostname or hostName;
- sshUser = host.sshUser or username;
- sshOpts = host.sshOpts or [];
- magicRollback = host.magicRollback or true;
- autoRollback = host.autoRollback or true;
- remoteBuild = host.remoteBuild or true;
- profiles =
- (lib.optionalAttrs (host.nixos or false) {
- system = {
- user = "root";
- path = deploy-rs.lib.${host.system}.activate.nixos nixosConfigurations.${hostName};
- };
- })
- // (let
- homeName = "${username}@${hostName}";
- in
- lib.optionalAttrs (homeConfigurations ? ${homeName}) {
- "${username}" = {
- user = username;
- path = deploy-rs.lib.${host.system}.activate.home-manager homeConfigurations.${homeName};
- };
- });
- })
- configData.hosts;
in {
inherit nixosConfigurations homeConfigurations configData;
@@ -144,10 +109,6 @@
haravara = import ./lib/haravara.nix;
};
- deploy = {
- nodes = deployNodes;
- };
-
devShells.x86_64-linux.default = let
pkgs = nixpkgs.legacyPackages.x86_64-linux;
in
@@ -155,7 +116,6 @@
packages = [
pkgs.nh
pkgs.nvd
- deploy-rs.packages.x86_64-linux.deploy-rs
];
};
};
diff --git a/hack/install_anywhere b/hack/install_anywhere
@@ -34,7 +34,7 @@ EOF
fi
echo "Resolving IP for $HOST_TARGET..."
-IP=$(nix eval .#deploy.nodes."$HOST_TARGET".hostname --raw)
+IP=$(nix eval .#configData.hosts."$HOST_TARGET".hostname --raw)
if ! ssh -o StrictHostKeyChecking=no -o ConnectTimeout=5 "root@$IP" "echo OK" >/dev/null 2>&1; then
exit 1
diff --git a/hosts/void/overlays/config/river/init b/hosts/void/overlays/config/river/init
@@ -124,7 +124,7 @@ riverctl map normal $alt+Shift Tab send-to-previous-tags
riverctl map normal $mod Tab focus-previous-tags
riverctl map normal $mod+Shift Tab send-to-previous-tags
-swaybg -m fill -c "#120d15" -i "$HOME/misc/random/wallpapers/14.jpg" &
+swaybg -m fill -c "#120d15" -i "$HOME/misc/random/wallpapers/void.jpg" &
mkfifo "$wobsock" && tail -f "$wobsock" | wob &
wl-paste --watch cliphist store &
diff --git a/justfile b/justfile
@@ -5,11 +5,11 @@ update:
nix flake update
check:
- nix flake check --no-update-lock-file 2>&1 | grep -vE "unknown flake output '(deploy|configData)'"
+ nix flake check --no-update-lock-file
deploy host="nixaran":
@backup -t git:nix
- nix develop -c deploy .#{{ host }} 2>&1 | grep -vE "unknown flake output '(deploy|configData)'"
+ NH_ELEVATION_STRATEGY=none nh os switch . --hostname {{ host }} --target-host root@{{ host }} --build-host root@{{ host }}
local:
-@backup -t git:nix
