diff --git a/outputs.nix b/outputs.nix index 4660e85..a6bcb19 100644 --- a/outputs.nix +++ b/outputs.nix @@ -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; diff --git a/shell.nix b/shell.nix index a016020..7d7b0e0 100644 --- a/shell.nix +++ b/shell.nix @@ -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 ]; }