diff options
Diffstat (limited to '')
| -rw-r--r-- | flake.lock | 26 | ||||
| -rw-r--r-- | flake.nix | 40 | ||||
| -rw-r--r-- | hosts/default.nix | 14 |
3 files changed, 7 insertions, 73 deletions
@@ -80,32 +80,6 @@ "type": "github" } }, - "deploy-rs": { - "inputs": { - "flake-compat": [ - "flake-compat" - ], - "nixpkgs": [ - "nixpkgs" - ], - "utils": [ - "flake-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": [ @@ -19,14 +19,6 @@ nixpkgs.follows = "nixpkgs"; }; }; - deploy-rs = { - url = "github:serokell/deploy-rs"; - inputs = { - flake-compat.follows = "flake-compat"; - nixpkgs.follows = "nixpkgs"; - utils.follows = "flake-utils"; - }; - }; # inputs for following systems = { @@ -105,7 +97,6 @@ nixpkgs-unstable, library, treefmt-nix, - deploy-rs, # modules agenix, turtle, @@ -119,20 +110,6 @@ nixos-lib = import (nixpkgs + "/nixos/lib") {}; pkgs = nixpkgs.legacyPackages.${system}; pkgsUnstable = nixpkgs-unstable.legacyPackages.${system}; - deployPackage = - (import nixpkgs { - inherit system; - overlays = [ - deploy-rs.overlays.default - (self: super: { - deploy-rs = { - inherit (pkgs) deploy-rs; - inherit (super.deploy-rs) lib; - }; - }) - ]; - }) - .deploy-rs; specialArgs = attrs @@ -160,18 +137,15 @@ tests = import ./tests {inherit pkgs specialArgs nixLib;}; vhackPackages = import ./pkgs {inherit pkgs nixLib pkgsUnstable;}; - hosts = import ./hosts {inherit pkgs nixLib nixpkgs specialArgs extraModules deployPackage;}; + hosts = import ./hosts {inherit pkgs nixLib nixpkgs specialArgs extraModules;}; inherit (library) nixLib; treefmtEval = import ./treefmt.nix {inherit treefmt-nix pkgs;}; in { - checks."${system}" = - nixLib.warnMerge (nixLib.warnMerge tests { - formatting = - treefmtEval.config.build.check self; - } "the flake checks and formatting") - (deployPackage.lib.deployChecks self.deploy) - "the flake checks and deploy-rs"; + checks."${system}" = nixLib.warnMerge tests { + formatting = + treefmtEval.config.build.check self; + } "the flake checks and formatting"; packages."${system}" = vhackPackages; formatter."${system}" = treefmtEval.config.build.wrapper; @@ -179,8 +153,6 @@ devShells."${system}" = { default = pkgs.mkShell { packages = [ - pkgs.deploy-rs - pkgs.git-bug # Used to update the stalwart-mail spamfilter @@ -192,6 +164,6 @@ }; }; - inherit (hosts) nixosConfigurations deploy; + inherit (hosts) nixosConfigurations; }; } diff --git a/hosts/default.nix b/hosts/default.nix index 664c376..651569d 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -4,10 +4,7 @@ nixpkgs, specialArgs, extraModules, - deployPackage, }: let - hostnames = builtins.fromTOML (builtins.readFile ./host-names.toml); - hosts = nixLib.mkByName { useShards = false; baseDirectory = ./by-name; @@ -26,15 +23,6 @@ ]; }; nixosConfigurations = builtins.mapAttrs mkNixosConfiguration hosts; - - mkDeploy = name: _: { - hostname = hostnames."${name}"; - profiles.system = { - user = "root"; - path = deployPackage.lib.activate.nixos nixosConfigurations."${name}"; - }; - }; - deploy = {nodes = builtins.mapAttrs mkDeploy hosts;}; in { - inherit nixosConfigurations deploy; + inherit nixosConfigurations; } |