From f5fa6a73af3b9380855115f415fea36aa2d09bae Mon Sep 17 00:00:00 2001 From: dadada Date: Mon, 30 Jan 2023 20:56:44 +0100 Subject: [PATCH] update and remove deploy-rs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'agenix': 'github:ryantm/agenix/42d371d861a227149dc9a7e03350c9ab8b8ddd68' (2023-01-09) → 'github:ryantm/agenix/49798e535ebc07fec82256b283d35be36d8c6c9a' (2023-01-29) • Updated input 'home-manager': 'github:nix-community/home-manager/89a8ba0b5b43b3350ff2e3ef37b66736b2ef8706' (2022-12-28) → 'github:nix-community/home-manager/65c47ced082e3353113614f77b1bc18822dc731f' (2023-01-23) • Updated input 'myNixpkgs': 'github:NixOS/nixpkgs/cdead16a444a3e5de7bc9b0af8e198b11bb01804' (2023-01-20) → 'github:NixOS/nixpkgs/f413457e0dd7a42adefdbcea4391dd9751509025' (2023-01-30) • Updated input 'nix-doom-emacs': 'github:nix-community/nix-doom-emacs/cac2195c172b084562f028542cd2332ef6d6f27c' (2023-01-20) → 'github:nix-community/nix-doom-emacs/e92e5b6021b1ad4290e051111010ba51921507cd' (2023-01-27) • Updated input 'nix-doom-emacs/emacs-overlay': 'github:nix-community/emacs-overlay/fa7dedfa5e1171a76ff78a1260064e1b20ec93bb' (2023-01-19) → 'github:nix-community/emacs-overlay/acff9f41c4962704acb8008e5ff5b90a43cf7758' (2023-01-26) • Updated input 'nix-doom-emacs/revealjs': 'github:hakimel/reveal.js/6510916b9f55a8f3110030bcdd1aee1b7fb77b6f' (2023-01-18) → 'github:hakimel/reveal.js/b1a9842b2f4544a2fda546383db38cc7a81f6b74' (2023-01-25) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/7bd6b87b3712e68007823e8dd5c37ee9b114fee3' (2023-01-15) → 'github:NixOS/nixos-hardware/b7ac0a56029e4f9e6743b9993037a5aaafd57103' (2023-01-24) --- checks.nix | 3 +- deploy.nix | 31 ------------ devshell.nix | 6 --- flake.lock | 100 +++++++++------------------------------ flake.nix | 4 -- nixos/configurations.nix | 2 +- outputs.nix | 6 +-- 7 files changed, 26 insertions(+), 126 deletions(-) delete mode 100644 deploy.nix diff --git a/checks.nix b/checks.nix index 3978881..65d3493 100644 --- a/checks.nix +++ b/checks.nix @@ -1,5 +1,4 @@ { self -, deploy-rs , flake-utils , nixpkgs , ... @@ -17,5 +16,5 @@ buildInputs = [ formatter ]; } "${formatter}/bin/nixpkgs-fmt --check ${./.} && touch $out"; - } // deploy-rs.lib."${system}".deployChecks self.deploy; + }; })).checks diff --git a/deploy.nix b/deploy.nix deleted file mode 100644 index 6812266..0000000 --- a/deploy.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ self, deploy-rs, ... }: -let - domain = "dadada.li"; - configs = self.nixosConfigurations; - daNode = hostname: - let - config = self.nixosConfigurations."${hostname}"; - system = config.pkgs.system; - activateNixos = deploy-rs.lib."${system}".activate.nixos; - in - { - hostname = "${hostname}.${domain}"; - fastConnection = true; - profiles = { - system = { - sshUser = "dadada"; - path = activateNixos config; - user = "root"; - }; - }; - }; -in -{ - nodes = builtins.mapAttrs (hostname: fun: fun hostname) { - agares = daNode; - ifrit = daNode; - pruflas = daNode; - surgat = daNode; - }; -} - diff --git a/devshell.nix b/devshell.nix index f9bd67a..ebdfb12 100644 --- a/devshell.nix +++ b/devshell.nix @@ -36,12 +36,6 @@ ''; category = "dev"; } - { - name = "deploy"; - help = "Deploy this flake"; - package = "deploy-rs"; - category = "deploy"; - } { name = "check"; help = "Run checks"; diff --git a/flake.lock b/flake.lock index f0b79ae..f235587 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1673301561, - "narHash": "sha256-gRUWHbBAtMuPDJQXotoI8u6+3DGBIUZHkyQWpIv7WpM=", + "lastModified": 1675030834, + "narHash": "sha256-e1/7Z7rVRqy2NuEOxrRm560wc/Kn8NU7gz8CDfmu9F0=", "owner": "ryantm", "repo": "agenix", - "rev": "42d371d861a227149dc9a7e03350c9ab8b8ddd68", + "rev": "49798e535ebc07fec82256b283d35be36d8c6c9a", "type": "github" }, "original": { @@ -36,28 +36,6 @@ "type": "github" } }, - "deploy-rs": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs": [ - "myNixpkgs" - ], - "utils": "utils" - }, - "locked": { - "lastModified": 1674127017, - "narHash": "sha256-QO1xF7stu5ZMDLbHN30LFolMAwY6TVlzYvQoUs1RD68=", - "owner": "serokell", - "repo": "deploy-rs", - "rev": "8c9ea9605eed20528bf60fae35a2b613b901fd77", - "type": "github" - }, - "original": { - "owner": "serokell", - "repo": "deploy-rs", - "type": "github" - } - }, "devshell": { "inputs": { "flake-utils": "flake-utils", @@ -194,11 +172,11 @@ "emacs-overlay": { "flake": false, "locked": { - "lastModified": 1674151952, - "narHash": "sha256-c0dwSGWi8LH2uBsv7ZJK11To1w8oFjTs+d2dtiusGug=", + "lastModified": 1674756934, + "narHash": "sha256-rbXnloG12DB0fY7wqBJ8JtN8Vqd47WQBdQ1lsHdoAh4=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "fa7dedfa5e1171a76ff78a1260064e1b20ec93bb", + "rev": "acff9f41c4962704acb8008e5ff5b90a43cf7758", "type": "github" }, "original": { @@ -304,22 +282,6 @@ } }, "flake-compat": { - "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-compat_2": { "flake": false, "locked": { "lastModified": 1673956053, @@ -483,14 +445,14 @@ "nixpkgs": [ "myNixpkgs" ], - "utils": "utils_2" + "utils": "utils" }, "locked": { - "lastModified": 1672244468, - "narHash": "sha256-xaZb8AZqoXRCSqPusCk4ouf+fUNP8UJdafmMTF1Ltlw=", + "lastModified": 1674440933, + "narHash": "sha256-CASRcD/rK3fn5vUCti3jzry7zi0GsqRsBohNq9wPgLs=", "owner": "nix-community", "repo": "home-manager", - "rev": "89a8ba0b5b43b3350ff2e3ef37b66736b2ef8706", + "rev": "65c47ced082e3353113614f77b1bc18822dc731f", "type": "github" }, "original": { @@ -537,11 +499,11 @@ }, "myNixpkgs": { "locked": { - "lastModified": 1674242456, - "narHash": "sha256-yBy7rCH7EiBe9+CHZm9YB5ii5GRa+MOxeW0oDEBO8SE=", + "lastModified": 1675061157, + "narHash": "sha256-F7/F65ZFWbq7cKSiV3K2acxCv64jKaZZ/K0A3VNT2kA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cdead16a444a3e5de7bc9b0af8e198b11bb01804", + "rev": "f413457e0dd7a42adefdbcea4391dd9751509025", "type": "github" }, "original": { @@ -562,7 +524,7 @@ "evil-org-mode": "evil-org-mode", "evil-quick-diff": "evil-quick-diff", "explain-pause-mode": "explain-pause-mode", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "flake-utils": "flake-utils_4", "format-all": "format-all", "nix-straight": "nix-straight", @@ -582,11 +544,11 @@ "ws-butler": "ws-butler" }, "locked": { - "lastModified": 1674178427, - "narHash": "sha256-3bSxHYmHET/6VVnSSzAEGRCV2ZoKCbVAvn/NXnDYOwM=", + "lastModified": 1674782939, + "narHash": "sha256-mf+RaqdCqqLraVVOQ5c8LRj+9ChnVzsUNlOjJSPdBbc=", "owner": "nix-community", "repo": "nix-doom-emacs", - "rev": "cac2195c172b084562f028542cd2332ef6d6f27c", + "rev": "e92e5b6021b1ad4290e051111010ba51921507cd", "type": "github" }, "original": { @@ -640,11 +602,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1673803274, - "narHash": "sha256-zaJDlHFXewT4KUsidMpRcPE+REymGH1Y3Eoc3Pjv4Xs=", + "lastModified": 1674550793, + "narHash": "sha256-ljJlIFQZwtBbzWqWTmmw2O5BFmQf1A/DspwMOQtGXHk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "7bd6b87b3712e68007823e8dd5c37ee9b114fee3", + "rev": "b7ac0a56029e4f9e6743b9993037a5aaafd57103", "type": "github" }, "original": { @@ -834,11 +796,11 @@ "revealjs": { "flake": false, "locked": { - "lastModified": 1674035434, - "narHash": "sha256-z+XxEX+GVcnKt4GAollnHTEHA8YkQfVOLLUuHka6EtA=", + "lastModified": 1674652670, + "narHash": "sha256-ViqeZlOjQTlY0KM7YcOOjdgkxRLPMZrRKXTqtyc1I00=", "owner": "hakimel", "repo": "reveal.js", - "rev": "6510916b9f55a8f3110030bcdd1aee1b7fb77b6f", + "rev": "b1a9842b2f4544a2fda546383db38cc7a81f6b74", "type": "github" }, "original": { @@ -850,7 +812,6 @@ "root": { "inputs": { "agenix": "agenix", - "deploy-rs": "deploy-rs", "devshell": "devshell", "flake-utils": "flake-utils_2", "helix": "helix", @@ -974,21 +935,6 @@ "type": "github" } }, - "utils_2": { - "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" - } - }, "ws-butler": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 4bc1215..a6eb1f8 100644 --- a/flake.nix +++ b/flake.nix @@ -32,10 +32,6 @@ url = github:ryantm/agenix; inputs.nixpkgs.follows = "myNixpkgs"; }; - deploy-rs = { - url = github:serokell/deploy-rs; - inputs.nixpkgs.follows = "myNixpkgs"; - }; devshell = { url = github:numtide/devshell; inputs.nixpkgs.follows = "myNixpkgs"; diff --git a/nixos/configurations.nix b/nixos/configurations.nix index 01a0094..f920ac1 100644 --- a/nixos/configurations.nix +++ b/nixos/configurations.nix @@ -16,7 +16,7 @@ let nixosSystem = { system ? "x86_64-linux", extraModules ? [ ] }: nixpkgs.lib.nixosSystem { inherit system; - modules = (nixpkgs.lib.attrValues self.nixosModules) ++ [ agenix.nixosModule ] ++ extraModules; + modules = (nixpkgs.lib.attrValues self.nixosModules) ++ [ agenix.nixosModules.age ] ++ extraModules; }; in { diff --git a/outputs.nix b/outputs.nix index dff9822..76d2343 100644 --- a/outputs.nix +++ b/outputs.nix @@ -1,6 +1,5 @@ # Adapted from Mic92/dotfiles { self -, deploy-rs , flake-utils , homePage , nixpkgs @@ -27,8 +26,7 @@ pkgs = import nixpkgs { inherit system; overlays = [ - agenix.overlay - (final: prev: { deploy-rs = deploy-rs.defaultPackage.${system}; }) + agenix.overlays.default devshell.overlay ]; }; @@ -69,7 +67,5 @@ hydraJobs = import ./hydra-jobs.nix inputs; - deploy = import ./deploy.nix inputs; - checks = import ./checks.nix inputs; }