diff --git a/outputs.nix b/outputs.nix index d4758aa..392401b 100644 --- a/outputs.nix +++ b/outputs.nix @@ -4,6 +4,7 @@ , nixpkgs-unstable , nixos-generators , sops-nix +, microvm , ... } @inputs: @@ -15,8 +16,27 @@ in (utils.lib.eachSystem (builtins.filter filter_system utils.lib.defaultSystems pkgs = nixpkgs.legacyPackages."${system}"; in { - devShells.default = pkgs.callPackage ./shell.nix { - inherit (sops-nix.packages."${pkgs.system}") sops-import-keys-hook ssh-to-pgp sops-init-gpg-key; + devShells.default = + let + sops = sops-nix.packages."${pkgs.system}"; + microvmpkg = microvm.packages."${pkgs.system}"; + in + pkgs.mkShell { + sopsPGPKeyDirs = [ + "./machines/secrets/keys/hosts" + "./machines/secrets/keys/users" + ]; + + nativeBuildInputs = [ + sops.ssh-to-pgp + sops.sops-import-keys-hook + sops.sops-init-gpg-key + pkgs.sops + pkgs.age + pkgs.python310Packages.grip + pkgs.mdbook + microvmpkg.microvm + ]; }; packages = { diff --git a/shell.nix b/shell.nix deleted file mode 100644 index 3799ec9..0000000 --- a/shell.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ mkShell -, sops-import-keys-hook -, ssh-to-pgp -, sops-init-gpg-key -, sops -, pkgs -}: - -mkShell { - sopsPGPKeyDirs = [ - "./machines/secrets/keys/hosts" - "./machines/secrets/keys/users" - ]; - - nativeBuildInputs = [ - ssh-to-pgp - sops-import-keys-hook - sops-init-gpg-key - sops - pkgs.age - pkgs.python310Packages.grip - pkgs.mdbook - ]; -}