diff --git a/devshell.nix b/devshell.nix index 9d446a9..139bb20 100644 --- a/devshell.nix +++ b/devshell.nix @@ -1,5 +1,7 @@ -{ pkgs, ... }: +{ pkgs, extraModules, ... }: (pkgs.devshell.mkShell { + imports = extraModules; + name = "dadada/nix-config"; packages = with pkgs; [ @@ -49,6 +51,6 @@ ]; git.hooks = { - pre-push = "nix flake check"; + pre-push.text = "nix flake check"; }; }) diff --git a/outputs.nix b/outputs.nix index caae297..83be7d9 100644 --- a/outputs.nix +++ b/outputs.nix @@ -31,8 +31,9 @@ devshell.overlay ]; }; + extraModules = [ "${devshell}/extra/git.nix" ]; in - import ./devshell.nix { inherit pkgs; }; + import ./devshell.nix { inherit pkgs extraModules; }; formatter = nixpkgs.legacyPackages."${system}".nixpkgs-fmt;