felix/nixos
1
0
Fork 0
mirror of https://github.com/Stunkymonkey/nixos.git synced 2025-05-24 09:54:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

try fixing the devShell

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

6
outputs.nix
View file

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

21
shell.nix
View file

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