From 6d1e4469fbe8fd3f69542f751dc6bf73235ce9ed Mon Sep 17 00:00:00 2001 From: Martin Myrseth Date: Mon, 6 Jul 2026 21:38:32 +0200 Subject: [PATCH] flake: Remove deploy-rs --- flake.lock | 112 +++++------------------------------- flake.nix | 30 +--------- lib/default.nix | 1 - lib/deployConf.nix | 12 ---- machines/deque.nix | 8 --- machines/nuckie/default.nix | 4 -- machines/rassie.nix | 4 -- 7 files changed, 14 insertions(+), 157 deletions(-) delete mode 100644 lib/deployConf.nix diff --git a/flake.lock b/flake.lock index e05b8d3..bed58d5 100644 --- a/flake.lock +++ b/flake.lock @@ -95,26 +95,6 @@ "type": "github" } }, - "deploy-rs": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs_2", - "utils": "utils" - }, - "locked": { - "lastModified": 1781627888, - "narHash": "sha256-5yHuAh9k7rT7rtf3uRaXkiUyYvQE9oaCgzhprLm2mr8=", - "owner": "serokell", - "repo": "deploy-rs", - "rev": "6d3087eedff75a715b40c0e124ba15d2dd7bec28", - "type": "github" - }, - "original": { - "owner": "serokell", - "repo": "deploy-rs", - "type": "github" - } - }, "disko": { "inputs": { "nixpkgs": [ @@ -176,22 +156,6 @@ } }, "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-compat_2": { "flake": false, "locked": { "lastModified": 1767039857, @@ -207,7 +171,7 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1767039857, @@ -225,7 +189,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1731533236, @@ -258,7 +222,7 @@ }, "git-hooks": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "gitignore": "gitignore", "nixpkgs": [ "nixpkgs" @@ -406,8 +370,8 @@ }, "nixon": { "inputs": { - "nixpkgs": "nixpkgs_3", - "utils": "utils_2" + "nixpkgs": "nixpkgs_2", + "utils": "utils" }, "locked": { "lastModified": 1782729998, @@ -425,7 +389,7 @@ }, "nixos-hardware": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1782562157, @@ -443,7 +407,7 @@ }, "nixos-wsl": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "nixpkgs": [ "nixpkgs" ] @@ -495,22 +459,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1743014863, - "narHash": "sha256-jAIUqsiN2r3hCuHji80U7NNEafpIMBXiwKlSrjWMlpg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "bd3bac8bfb542dbde7ffffb6987a1a1f9d41699f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1782535326, "narHash": "sha256-ZeRxu4yn6shd3SNF5ZUQb4r7BaVo1zBKMjRhfoNSBmw=", @@ -526,7 +474,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1767892417, "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=", @@ -539,7 +487,7 @@ "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1782467914, "narHash": "sha256-pGvFkM8N0xEkIIXDe5YYfbEAvHrk4IxBrjB/x8OomhE=", @@ -555,7 +503,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1713995372, "narHash": "sha256-fFE3M0vCoiSwCX02z8VF58jXFRj9enYUSTqjyHAjrds=", @@ -573,7 +521,7 @@ }, "piddif": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1714426376, @@ -617,7 +565,6 @@ "alacritty-catppuccin": "alacritty-catppuccin", "alacritty-dracula": "alacritty-dracula", "annodate": "annodate", - "deploy-rs": "deploy-rs", "disko": "disko", "dms": "dms", "doomemacs": "doomemacs", @@ -630,7 +577,7 @@ "nixon": "nixon", "nixos-hardware": "nixos-hardware", "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nixpkgs-stable": "nixpkgs-stable", "piddif": "piddif", "treefmt-nix": "treefmt-nix", @@ -682,21 +629,6 @@ "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" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -719,25 +651,7 @@ }, "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" - } - }, - "utils_2": { - "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1731533236, diff --git a/flake.nix b/flake.nix index 6938668..eed43e5 100644 --- a/flake.nix +++ b/flake.nix @@ -32,7 +32,6 @@ }; # Tools + Utils - deploy-rs.url = "github:serokell/deploy-rs"; flake-utils.url = "github:numtide/flake-utils"; agenix = { url = "github:ryantm/agenix"; @@ -90,7 +89,6 @@ let overlays = [ inputs.agenix.overlays.default - inputs.deploy-rs.overlays.default inputs.i3ws.overlay inputs.annodate.overlay inputs.nixon.overlay @@ -119,14 +117,6 @@ # NixOS machines nixosConfigurations = lib.myme.allProfiles lib.myme.makeNixOS; - # Deploy nodes - deploy.nodes = lib.myme.allProfilesIf (_: host: host ? deploy) ( - lib.myme.deployConf { - inherit (inputs) deploy-rs; - inherit (self) nixosConfigurations; - } - ); - # Non-NixOS machines (Fedora, WSL, ++) homeConfigurations = lib.myme.nixos2hm { inherit (self) nixosConfigurations; }; @@ -174,18 +164,7 @@ formatter = treefmtEval.config.build.wrapper; # `nix flake check` - checks = { - pre-commit = pre-commit-check; - } - // lib.optionalAttrs (inputs.deploy-rs.lib ? ${system}) ( - # Only check deploy nodes that target the current system — - # cross-arch builds would require qemu emulation in CI. - inputs.deploy-rs.lib.${system}.deployChecks { - nodes = lib.filterAttrs ( - name: _: self.nixosConfigurations.${name}.pkgs.stdenv.hostPlatform.system == system - ) self.deploy.nodes; - } - ); + checks.pre-commit = pre-commit-check; # Apps for `nix run .#` (Linux only) apps = lib.optionalAttrs isLinux { @@ -193,10 +172,6 @@ type = "app"; program = "${pkgs.agenix}/bin/agenix"; }; - deploy = { - type = "app"; - program = "${pkgs.deploy-rs.deploy-rs}/bin/deploy"; - }; }; # All packages under pkgs.myme.pkgs from the overlay (Linux only) @@ -219,9 +194,6 @@ }; } // lib.optionalAttrs isLinux { - # Deployment to other nodes - deploy = pkgs.mkShell { buildInputs = with pkgs; [ deploy-rs.deploy-rs ]; }; - # For hacking on XMonad xmonad = pkgs.mkShell { buildInputs = with pkgs; [ diff --git a/lib/default.nix b/lib/default.nix index 1dff6c7..d010a2a 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -13,7 +13,6 @@ in allNixFiles = import ./allNixFiles.nix { inherit lib; }; allProfiles = allProfilesIf (_: _: true); inherit allProfilesIf; - deployConf = import ./deployConf.nix; nixos2hm = import ./nixos2hm.nix { inherit lib; }; makeNixOS = import ./makeNixOS.nix { inherit inputs overlays; }; }; diff --git a/lib/deployConf.nix b/lib/deployConf.nix deleted file mode 100644 index 16ca49b..0000000 --- a/lib/deployConf.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ deploy-rs, nixosConfigurations }: - -name: host: { - hostname = host.deploy.host; - profiles.system = { - sshUser = nixosConfigurations."${name}".config.myme.machine.user.name; - sshOpts = host.deploy.sshOpts or { }; - magicRollback = false; - path = deploy-rs.lib."${host.system}".activate.nixos nixosConfigurations."${name}"; - user = "root"; - }; -} diff --git a/machines/deque.nix b/machines/deque.nix index 0b8c72d..5665499 100644 --- a/machines/deque.nix +++ b/machines/deque.nix @@ -4,14 +4,6 @@ let in { inherit system; - deploy = { - host = "deque.myme.no"; - sshOpts = [ - "-A" - "-p" - (builtins.toString sshPort) - ]; - }; stable = true; config = { diff --git a/machines/nuckie/default.nix b/machines/nuckie/default.nix index 89339f1..7bb87a8 100644 --- a/machines/nuckie/default.nix +++ b/machines/nuckie/default.nix @@ -1,9 +1,5 @@ { system = "x86_64-linux"; - deploy = { - host = "192.168.1.5"; - sshOpts = [ "-tt" ]; - }; config = { config, diff --git a/machines/rassie.nix b/machines/rassie.nix index 29ee502..19c713e 100644 --- a/machines/rassie.nix +++ b/machines/rassie.nix @@ -3,10 +3,6 @@ let in { inherit system; - deploy = { - host = "192.168.1.7"; - sshOpts = [ "-t" ]; - }; stable = true; config = {