From 96c5d9f4afdb75d21770958bf5f72ecd8dae227f Mon Sep 17 00:00:00 2001 From: Thomas Boerger Date: Wed, 15 Feb 2023 09:10:48 +0100 Subject: [PATCH] feat: upgrade flakes, drop deploy-rs and arion --- flake.lock | 152 +++++++++++------------------------------------------ flake.nix | 62 ++-------------------- 2 files changed, 34 insertions(+), 180 deletions(-) diff --git a/flake.lock b/flake.lock index 18b212f..ec100f1 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,17 @@ "nodes": { "agenix": { "inputs": { + "darwin": "darwin", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1673301561, - "narHash": "sha256-gRUWHbBAtMuPDJQXotoI8u6+3DGBIUZHkyQWpIv7WpM=", + "lastModified": 1676153903, + "narHash": "sha256-uetRyjgMiZCs6srmZ10M764Vn7F53M9mVuqnzHmyBqU=", "owner": "ryantm", "repo": "agenix", - "rev": "42d371d861a227149dc9a7e03350c9ab8b8ddd68", + "rev": "ea17cc71b4e1bc5b2601f210a1c85db9453ad723", "type": "github" }, "original": { @@ -20,94 +21,35 @@ "type": "github" } }, - "arion": { + "darwin": { "inputs": { - "flake-parts": "flake-parts", - "haskell-flake": "haskell-flake", "nixpkgs": [ + "agenix", "nixpkgs" ] }, "locked": { - "lastModified": 1673633885, - "narHash": "sha256-XxFZvY20EqOYlOP1dF/YcPYpgSJtlRIqIeWXHJqCnws=", - "owner": "hercules-ci", - "repo": "arion", - "rev": "09ef2d13771ec1309536bbf97720767f90a5afa7", + "lastModified": 1673295039, + "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "87b9d090ad39b25b2400029c64825fc2a8868943", "type": "github" }, "original": { - "owner": "hercules-ci", - "repo": "arion", - "type": "github" - } - }, - "deployrs": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs": [ - "nixpkgs" - ], - "utils": "utils" - }, - "locked": { - "lastModified": 1672327199, - "narHash": "sha256-pFlngSHXKBhAmbaKZ4FYtu57LLunG+vWdL7a5vw1RvQ=", - "owner": "serokell", - "repo": "deploy-rs", - "rev": "a5619f5660a00f58c2b7c16d89058e92327ac9b8", - "type": "github" - }, - "original": { - "owner": "serokell", - "repo": "deploy-rs", - "type": "github" - } - }, - "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-parts": { - "inputs": { - "nixpkgs-lib": [ - "arion", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1672877861, - "narHash": "sha256-ROnSmsk5grROL6gnHBnSdqlPPBrBJMApCeB7xzY567M=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "7930f5b1c356270cec420d4f4cb43f4907206640", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", + "owner": "lnl7", + "ref": "master", + "repo": "nix-darwin", "type": "github" } }, "hardware": { "locked": { - "lastModified": 1673803274, - "narHash": "sha256-zaJDlHFXewT4KUsidMpRcPE+REymGH1Y3Eoc3Pjv4Xs=", + "lastModified": 1675933606, + "narHash": "sha256-y427VhPQHOKkYvkc9MMsL/2R7M11rQxzsRdRLM3htx8=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "7bd6b87b3712e68007823e8dd5c37ee9b114fee3", + "rev": "44ae00e02e8036a66c08f4decdece7e3bbbefee2", "type": "github" }, "original": { @@ -116,34 +58,19 @@ "type": "github" } }, - "haskell-flake": { - "locked": { - "lastModified": 1668167720, - "narHash": "sha256-5wDTR6xt9BB3BjgKR+YOjOkZgMyDXKaX79g42sStzDU=", - "owner": "srid", - "repo": "haskell-flake", - "rev": "4fc511d93a55fedf815c1647ad146c26d7a2054e", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "haskell-flake", - "type": "github" - } - }, "homemanager": { "inputs": { "nixpkgs": [ "nixpkgs" ], - "utils": "utils_2" + "utils": "utils" }, "locked": { - "lastModified": 1673815682, - "narHash": "sha256-zG7Rroki+89poCTr1D8BM/wTCl+DZJvU4IUE+5hxG7U=", + "lastModified": 1675935446, + "narHash": "sha256-WajulTn7QdwC7QuXRBavrANuIXE5z+08EdxdRw1qsNs=", "owner": "nix-community", "repo": "home-manager", - "rev": "3e42035fc013ed4d8af6ee8dc0079c0c551c45a5", + "rev": "2dce7f1a55e785a22d61668516df62899278c9e4", "type": "github" }, "original": { @@ -154,11 +81,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1673631141, - "narHash": "sha256-AprpYQ5JvLS4wQG/ghm2UriZ9QZXvAwh1HlgA/6ZEVQ=", + "lastModified": 1676300157, + "narHash": "sha256-1HjRzfp6LOLfcj/HJHdVKWAkX9QRAouoh6AjzJiIerU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "befc83905c965adfd33e5cae49acb0351f6e0404", + "rev": "545c7a31e5dedea4a6d372712a18e00ce097d462", "type": "github" }, "original": { @@ -170,11 +97,11 @@ }, "nur": { "locked": { - "lastModified": 1673858859, - "narHash": "sha256-NYGSRzk5KY79igJisr1j++ApdE3StAj6p06buHFe2qY=", + "lastModified": 1676443773, + "narHash": "sha256-C+hag3jz5wMKK9qNI8vfVNNZSX66X9PAtjGfNyRDCm8=", "owner": "nix-community", "repo": "NUR", - "rev": "4a9bc77b7d0866e7e6312f9e8b87bcb15ff7576a", + "rev": "26954520ec2df7d9d4137ec584412a6eb6a20f48", "type": "github" }, "original": { @@ -186,13 +113,11 @@ "root": { "inputs": { "agenix": "agenix", - "arion": "arion", - "deployrs": "deployrs", "hardware": "hardware", "homemanager": "homemanager", "nixpkgs": "nixpkgs", "nur": "nur", - "utils": "utils_3" + "utils": "utils_2" } }, "utils": { @@ -212,26 +137,11 @@ }, "utils_2": { "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1676283394, + "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "utils_3": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7bec205..daadc48 100644 --- a/flake.nix +++ b/flake.nix @@ -24,22 +24,12 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - deployrs = { - url = "github:serokell/deploy-rs"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - arion = { - url = "github:hercules-ci/arion"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - hardware = { url = "github:nixos/nixos-hardware"; }; }; - outputs = { self, nixpkgs, nur, utils, agenix, homemanager, deployrs, arion, hardware, ... }@inputs: + outputs = { self, nixpkgs, nur, utils, agenix, homemanager, hardware, ... }@inputs: let mkComputer = configurationNix: systemName: extraModules: nixpkgs.lib.nixosSystem { system = systemName; @@ -64,8 +54,7 @@ }; }) homemanager.nixosModules.home-manager - agenix.nixosModules.age - arion.nixosModules.arion + agenix.nixosModules.default configurationNix ] ++ extraModules; @@ -146,50 +135,6 @@ asgard = self.nixosConfigurations.asgard.config.system.build.toplevel; utgard = self.nixosConfigurations.utgard.config.system.build.toplevel; midgard = self.nixosConfigurations.midgard.config.system.build.toplevel; - - deploy = { - nodes = { - asgard = { - sshOpts = [ "-p" "22" ]; - hostname = "192.168.1.10"; - fastConnection = true; - - profiles.system = { - sshUser = "admin"; - user = "root"; - path = deployrs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.asgard; - }; - }; - - utgard = { - sshOpts = [ "-p" "22" ]; - hostname = "192.168.1.11"; - fastConnection = true; - - profiles.system = { - sshUser = "admin"; - user = "root"; - path = deployrs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.utgard; - }; - }; - - midgard = { - sshOpts = [ "-p" "22" ]; - hostname = "192.168.1.5"; - fastConnection = true; - - profiles.system = { - sshUser = "admin"; - user = "root"; - path = deployrs.lib.aarch64-linux.activate.nixos self.nixosConfigurations.midgard; - }; - }; - }; - }; - - checks = builtins.mapAttrs - (system: deployLib: deployLib.deployChecks self.deploy) - deployrs.lib; } // utils.lib.eachDefaultSystem (system: let pkgs = nixpkgs.legacyPackages.${system}; @@ -198,8 +143,7 @@ { devShell = pkgs.mkShell { buildInputs = with pkgs; [ - agenix.defaultPackage.${system} - deployrs.defaultPackage.${system} + agenix.packages.${system}.default nixpkgs-fmt gnumake nixUnstable