diff --git a/default.nix b/default.nix index 46e7350d..70c5aaf5 100644 --- a/default.nix +++ b/default.nix @@ -58,6 +58,11 @@ in in [ pkgs.npins + pkgs.nil + (pkgs.callPackage "${sources.agenix}/pkgs/agenix.nix" { }) + pkgs.openssh + pkgs.httpie + pkgs.jq pkgs.nix-unit test-loop nixops4.packages.${system}.default diff --git a/flake.nix b/flake.nix index e2049636..dbf01ff0 100644 --- a/flake.nix +++ b/flake.nix @@ -11,7 +11,7 @@ let sources = import ./npins; inherit (import sources.flake-inputs) import-flake; - inherit (sources) git-hooks agenix; + inherit (sources) git-hooks; # XXX(@fricklerhandwerk): this atrocity is required to splice in a foreign Nixpkgs via flake-parts # XXX - this is just importing a flake nixpkgs = import-flake { src = sources.nixpkgs; }; @@ -54,7 +54,6 @@ { pkgs, lib, - inputs', ... }: { @@ -73,21 +72,6 @@ trim-trailing-whitespace.enable = true; shellcheck.enable = true; }; - - devShells.default = pkgs.mkShell { - packages = [ - pkgs.npins - pkgs.nil - (pkgs.callPackage "${agenix}/pkgs/agenix.nix" { }) - pkgs.openssh - pkgs.httpie - pkgs.jq - # exposing this env var as a hack to pass info in from form - (inputs'.nixops4.packages.default.overrideAttrs { - impureEnvVars = [ "DEPLOYMENT" ]; - }) - ]; - }; }; } );