[nix] fix devshell

This commit is contained in:
2024-12-10 13:59:32 +01:00
parent 62afc684db
commit 307e68a1ca
2 changed files with 22 additions and 26 deletions

View File

@@ -4,6 +4,7 @@
, nixpkgs-unstable , nixpkgs-unstable
, nixos-generators , nixos-generators
, sops-nix , sops-nix
, microvm
, ... , ...
} @inputs: } @inputs:
@@ -15,8 +16,27 @@ in (utils.lib.eachSystem (builtins.filter filter_system utils.lib.defaultSystems
pkgs = nixpkgs.legacyPackages."${system}"; pkgs = nixpkgs.legacyPackages."${system}";
in in
{ {
devShells.default = pkgs.callPackage ./shell.nix { devShells.default =
inherit (sops-nix.packages."${pkgs.system}") sops-import-keys-hook ssh-to-pgp sops-init-gpg-key; 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 = { packages = {

View File

@@ -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
];
}