try fixing the devShell

This commit is contained in:
Felix Buehler 2022-06-26 17:59:16 +02:00
parent 3ee8594bb5
commit 987f43dd63
2 changed files with 9 additions and 18 deletions

View file

@ -11,10 +11,10 @@
pkgs = nixpkgs.legacyPackages."${system}"; pkgs = nixpkgs.legacyPackages."${system}";
in in
{ {
devShell = pkgs.callPackage ./shell.nix { devShells."${system}".default = import ./shell.nix ( inputs // {
inherit (sops-nix.packages."${pkgs.system}") sops-import-keys-hook ssh-to-pgp sops-init-gpg-key; inherit (sops-nix.packages."${pkgs.system}") sops-import-keys-hook;
inherit (deploy-rs.packages."${pkgs.system}") deploy-rs; inherit (deploy-rs.packages."${pkgs.system}") deploy-rs;
}; });
})) // { })) // {
nixosConfigurations = import ./nixos/configurations.nix (inputs // { nixosConfigurations = import ./nixos/configurations.nix (inputs // {
inherit inputs; inherit inputs;

View file

@ -1,26 +1,17 @@
{ mkShell { mkShellNoCC
, sops-import-keys-hook , ssh-to-age
, ssh-to-pgp
, sops-init-gpg-key
, sops , sops
, sops-import-keys-hook
, deploy-rs , deploy-rs
, nixpkgs-fmt , nixpkgs-fmt
, knot-dns
, lefthook
, python3
}: }:
mkShell { mkShellNoCC {
sopsPGPKeyDirs = [ "./nixos/secrets/keys" ];
nativeBuildInputs = [ nativeBuildInputs = [
python3.pkgs.invoke ssh-to-age
ssh-to-pgp
sops-import-keys-hook
sops-init-gpg-key
sops sops
sops-import-keys-hook
deploy-rs deploy-rs
nixpkgs-fmt nixpkgs-fmt
lefthook
knot-dns
]; ];
} }