From 8c0e218639927cbc68ac3f5a6132f1bdcc5c5439 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikodem=20Rabuli=C5=84ski?= Date: Mon, 2 Oct 2023 19:34:31 +0200 Subject: [PATCH] Drop deploy-rs --- README.md | 1 - deploy.nix | 18 ----------------- flake.lock | 58 ++---------------------------------------------------- flake.nix | 6 ------ 4 files changed, 2 insertions(+), 81 deletions(-) delete mode 100644 deploy.nix diff --git a/README.md b/README.md index cf09670..77a7a74 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,6 @@ Collection of my personal Nix configurations and opinionated NixOS, nix-darwin, - wrappers - nix packages wrapped with my configs (see: [wrapper-manager](https://github.com/viperML/wrapper-manager)) - assets - miscellaneous values reused throughout my config - effects.nix - hercules-ci configuration -- deploy.nix - deploy-rs configuration [^1]: Machine not migrated yet or in the process of migrating. See: https://nest.pijul.com/nrabulinski/nix-config diff --git a/deploy.nix b/deploy.nix deleted file mode 100644 index dadf7e6..0000000 --- a/deploy.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ - self, - lib, - inputs, - ... -}: { - flake.deploy.nodes = - lib.mapAttrs (name: value: { - hostname = name; - sshUser = "niko"; - profiles.system = { - user = "root"; - path = inputs.deploy-rs.lib.${value.pkgs.stdenv.system}.activate.nixos value; - }; - remoteBuild = true; - }) - self.nixosConfigurations; -} diff --git a/flake.lock b/flake.lock index 49eb66c..35eb62b 100644 --- a/flake.lock +++ b/flake.lock @@ -81,28 +81,6 @@ "type": "github" } }, - "deploy-rs": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs": [ - "nixpkgs" - ], - "utils": "utils" - }, - "locked": { - "lastModified": 1695052866, - "narHash": "sha256-agn7F9Oww4oU6nPiw+YiYI9Xb4vOOE73w8PAoBRP4AA=", - "owner": "serokell", - "repo": "deploy-rs", - "rev": "e3f41832680801d0ee9e2ed33eb63af398b090e9", - "type": "github" - }, - "original": { - "owner": "serokell", - "repo": "deploy-rs", - "type": "github" - } - }, "disko": { "inputs": { "nixpkgs": [ @@ -139,22 +117,6 @@ "type": "github" } }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1668681692, - "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "009399224d5e398d03b22badca40a37ac85412a1", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -260,13 +222,13 @@ "mailserver": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "nixpkgs": [ "nixpkgs" ], "nixpkgs-22_11": "nixpkgs-22_11", "nixpkgs-23_05": "nixpkgs-23_05", - "utils": "utils_2" + "utils": "utils" }, "locked": { "lastModified": 1689976554, @@ -473,7 +435,6 @@ "agenix": "agenix", "darwin": "darwin", "darwin-old-for-agenix": "darwin-old-for-agenix", - "deploy-rs": "deploy-rs", "disko": "disko", "flake-parts": "flake-parts", "hercules-ci-agent": "hercules-ci-agent", @@ -489,21 +450,6 @@ } }, "utils": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "utils_2": { "locked": { "lastModified": 1605370193, "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=", diff --git a/flake.nix b/flake.nix index 4f0ae2e..2f16de7 100644 --- a/flake.nix +++ b/flake.nix @@ -14,7 +14,6 @@ ./hosts ./modules ./wrappers - ./deploy.nix ./effects.nix ]; @@ -27,7 +26,6 @@ devShells.default = pkgs.mkShellNoCC { packages = [ - inputs'.deploy-rs.packages.deploy-rs inputs'.agenix.packages.agenix ] # TODO: Contribute darwin support to nh @@ -52,10 +50,6 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - deploy-rs = { - url = "github:serokell/deploy-rs"; - inputs.nixpkgs.follows = "nixpkgs"; - }; niko-nur = { url = "github:nrabulinski/nur-packages"; # Not overriding nixpkgs to get cache hits