From 38aff239a040c95fc42005a17c99a8f390d9ae2b Mon Sep 17 00:00:00 2001 From: James Walker Date: Mon, 26 May 2025 17:03:14 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A5remove=20deploy-rs=20(no=20longer?= =?UTF-8?q?=20in=20use)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flake.lock | 110 ++++++------------------------ flake.nix | 8 --- nix/checks.nix | 3 - nix/deploy.nix | 51 -------------- nix/hosts/heraclitus/homebrew.nix | 2 +- nix/shells.nix | 1 - 6 files changed, 20 insertions(+), 155 deletions(-) delete mode 100644 nix/deploy.nix diff --git a/flake.lock b/flake.lock index 833ffb2..4f0e6fc 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1747494142, - "narHash": "sha256-7TAUwDVZWq82t/x3+zZ5y+Tjl2hLL2c8+8pv9zCUbTo=", + "lastModified": 1748149228, + "narHash": "sha256-mmonYFesFo42UUS49Hd0bcbVJRWX/aHBCDYUkkvylf4=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "8e251e45346e9d58e0eece2512e40c183f967e8f", + "rev": "a9939228f661df370c4094fe85f683e45d761dbe", "type": "github" }, "original": { @@ -21,45 +21,7 @@ "type": "github" } }, - "deploy-rs": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs": [ - "nixpkgs" - ], - "utils": "utils" - }, - "locked": { - "lastModified": 1727447169, - "narHash": "sha256-3KyjMPUKHkiWhwR91J1YchF6zb6gvckCAY1jOE+ne0U=", - "owner": "serokell", - "repo": "deploy-rs", - "rev": "aa07eb05537d4cd025e2310397a6adcedfe72c76", - "type": "github" - }, - "original": { - "owner": "serokell", - "repo": "deploy-rs", - "type": "github" - } - }, "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { "flake": false, "locked": { "lastModified": 1747046372, @@ -75,7 +37,7 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1696426674, @@ -93,7 +55,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1731533236, @@ -137,11 +99,11 @@ ] }, "locked": { - "lastModified": 1747439237, - "narHash": "sha256-5rCGrnkglKKj4cav1U3HC+SIUNJh08pqOK4spQv9RjA=", + "lastModified": 1748227609, + "narHash": "sha256-SaSdslyo6UGDpPUlmrPA4dWOEuxCy2ihRN9K6BnqYsA=", "owner": "nix-community", "repo": "home-manager", - "rev": "ae755329092c87369b9e9a1510a8cf1ce2b1c708", + "rev": "d23d20f55d49d8818ac1f1b2783671e8a6725022", "type": "github" }, "original": { @@ -207,11 +169,11 @@ ] }, "locked": { - "lastModified": 1742568034, - "narHash": "sha256-QaMEhcnscfF2MqB7flZr+sLJMMYZPnvqO4NYf9B4G38=", + "lastModified": 1747663185, + "narHash": "sha256-Obh50J+O9jhUM/FgXtI3he/QRNiV9+J53+l+RlKSaAk=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "42ee229088490e3777ed7d1162cb9e9d8c3dbb11", + "rev": "ee07ba0d36c38e9915c55d2ac5a8fb0f05f2afcc", "type": "github" }, "original": { @@ -222,11 +184,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1747426788, - "narHash": "sha256-N4cp0asTsJCnRMFZ/k19V9akkxb7J/opG+K+jU57JGc=", + "lastModified": 1748217807, + "narHash": "sha256-P3u2PXxMlo49PutQLnk2PhI/imC69hFl1yY4aT5Nax8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "12a55407652e04dcf2309436eb06fef0d3713ef3", + "rev": "3108eaa516ae22c2360928589731a4f1581526ef", "type": "github" }, "original": { @@ -254,7 +216,7 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "gitignore": "gitignore", "nixpkgs": [ "nixpkgs" @@ -304,8 +266,7 @@ "root": { "inputs": { "darwin": "darwin", - "deploy-rs": "deploy-rs", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "flake-utils": "flake-utils", "home-manager": "home-manager", "nixos-generators": "nixos-generators", @@ -441,11 +402,11 @@ ] }, "locked": { - "lastModified": 1746485181, - "narHash": "sha256-PxrrSFLaC7YuItShxmYbMgSuFFuwxBB+qsl9BZUnRvg=", + "lastModified": 1747603214, + "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e93ee1d900ad264d65e9701a5c6f895683433386", + "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd", "type": "github" }, "original": { @@ -468,39 +429,6 @@ "repo": "default", "type": "github" } - }, - "systems_2": { - "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" - }, - "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index bbd1c56..bc1f3c6 100644 --- a/flake.nix +++ b/flake.nix @@ -6,11 +6,6 @@ raspberry-pi-nix.url = "github:nix-community/raspberry-pi-nix"; flake-utils.url = "github:numtide/flake-utils"; - deploy-rs = { - url = "github:serokell/deploy-rs"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - darwin = { url = "github:nix-darwin/nix-darwin/master"; inputs.nixpkgs.follows = "nixpkgs"; @@ -47,7 +42,6 @@ self, nixpkgs, flake-utils, - deploy-rs, pre-commit-hooks, ... }@inputs: @@ -64,7 +58,6 @@ inherit self pkgs - deploy-rs system pre-commit-hooks ; @@ -79,7 +72,6 @@ darwinConfigurations = import ./nix/darwin.nix inputs; nixosConfigurations = import ./nix/nixos.nix inputs; - deploy = import ./nix/deploy.nix inputs; nixConfig = { extra-substituters = [ diff --git a/nix/checks.nix b/nix/checks.nix index 5ab895d..75271bc 100644 --- a/nix/checks.nix +++ b/nix/checks.nix @@ -1,7 +1,5 @@ { - self, system, - deploy-rs, pre-commit-hooks, ... }: @@ -15,4 +13,3 @@ }; }; } -// (deploy-rs.lib.${system}.deployChecks self.deploy) diff --git a/nix/deploy.nix b/nix/deploy.nix deleted file mode 100644 index 485c939..0000000 --- a/nix/deploy.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - self, - nixpkgs, - deploy-rs, - ... -}: -let - mkDeploy = - hostName: - let - inherit (self.hosts.${hostName}) - type - address - system - sshUser - ; - pkgs = import nixpkgs { inherit system; }; - deployPkgs = import nixpkgs { - inherit system; - overlays = [ - deploy-rs.overlays.default - (_self: super: { - deploy-rs = { - inherit (pkgs) deploy-rs; - inherit (super.deploy-rs) lib; - }; - }) - ]; - }; - inherit (deployPkgs.deploy-rs.lib) activate; - in - { - hostname = address; - profiles.system = { - user = "root"; - inherit sshUser; - path = activate.${type} self."${type}Configurations".${hostName}; - }; - }; -in -{ - nodes = { - socrates = mkDeploy "socrates"; - plato = mkDeploy "plato"; - agent = mkDeploy "agent"; - form = mkDeploy "form"; - matter = mkDeploy "matter"; - purpose = mkDeploy "purpose"; - epicurus = mkDeploy "epicurus"; - }; -} diff --git a/nix/hosts/heraclitus/homebrew.nix b/nix/hosts/heraclitus/homebrew.nix index 2423278..414d668 100644 --- a/nix/hosts/heraclitus/homebrew.nix +++ b/nix/hosts/heraclitus/homebrew.nix @@ -39,7 +39,6 @@ _: "opentofu" "podman" "ripgrep" - "sentry-cli" "tea" "terminal-notifier" "watchman" @@ -48,6 +47,7 @@ _: casks = [ "1password" "1password-cli" + "actual" "android-studio" "balenaetcher" "beeper" diff --git a/nix/shells.nix b/nix/shells.nix index 1a1cf27..622dd0b 100644 --- a/nix/shells.nix +++ b/nix/shells.nix @@ -8,7 +8,6 @@ default = pkgs.mkShell { name = "athens"; buildInputs = with pkgs; [ - deploy-rs deadnix doctl nixd