diff --git a/dev-shells.nix b/dev-shells.nix deleted file mode 100644 index 2d9ff4d..0000000 --- a/dev-shells.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ - self, - nixpkgs, - flake-utils, - ... -}: -flake-utils.lib.eachDefaultSystem (system: { - devShells.default = nixpkgs.legacyPackages.${system}.mkShell { - inherit (self.checks.${system}.pre-commit-check) shellHook; - buildInputs = self.checks.${system}.pre-commit-check.enabledPackages; - }; -}) diff --git a/flake.nix b/flake.nix index 262f27e..b1b068b 100644 --- a/flake.nix +++ b/flake.nix @@ -52,13 +52,25 @@ }; }; - outputs = inputs @ {flake-utils, ...}: - flake-utils.lib.meld inputs [ + outputs = inputs @ { + self, + nixpkgs, + flake-utils, + ... + }: + (flake-utils.lib.meld inputs [ ./packages.nix ./formatter.nix ./nixos-configurations.nix ./checks.nix - ./dev-shells.nix ./colmena.nix - ]; + ]) + // flake-utils.lib.eachDefaultSystem (system: { + devShells.default = nixpkgs.legacyPackages.${system}.mkShell { + inherit (self.checks.${system}.pre-commit-check) shellHook; + buildInputs = + self.checks.${system}.pre-commit-check.enabledPackages + ++ (with nixpkgs.legacyPackages.${system}; [colmena]); + }; + }); }