From 8dd038ecf1e8c818ca6dc598bdcc1e7355aa3772 Mon Sep 17 00:00:00 2001 From: iFargle Date: Tue, 12 Dec 2023 13:29:35 +0900 Subject: [PATCH] reorg --- flake.nix | 9 +++++++++ lib/default.nix | 9 --------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.nix b/flake.nix index 90ea5440..1e84a585 100644 --- a/flake.nix +++ b/flake.nix @@ -74,5 +74,14 @@ nixos-iso-console = libx.mkImage { hostname = "nixos-iso-console"; format = "iso"; }; nixos-iso-desktop = libx.mkImage { hostname = "nixos-iso-desktop"; format = "iso"; desktop = "gnome"; }; }; + + # Checks for deploy-rs - Makes deploy-rs fail when system evaluations fail + checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib; + + # Devshell for bootstrapping; acessible via 'nix develop' + devShells = libx.forAllSystems (system: + let pkgs = nixpkgs.legacyPackages.${system}; + in import ./shell.nix { inherit pkgs sops-nix deploy-rs system; } + ); }; } \ No newline at end of file diff --git a/lib/default.nix b/lib/default.nix index 99e25dd5..3a692026 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -109,13 +109,4 @@ "aarch64-linux" "x86_64-linux" ]; - - # Checks for deploy-rs - Makes deploy-rs fail when system evaluations fail - checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib; - - # Devshell for bootstrapping; acessible via 'nix develop' - devShells = libx.forAllSystems (system: - let pkgs = nixpkgs.legacyPackages.${system}; - in import ./shell.nix { inherit pkgs sops-nix deploy-rs system; } - ); } \ No newline at end of file