From 29c8aed76ea21a3de303875efb13f1ef9bb7695f Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 28 Jul 2024 19:46:00 +0200 Subject: [PATCH] flake/git-hooks: reuse devshell --- flake.nix | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/flake.nix b/flake.nix index d01910b..edc93ae 100644 --- a/flake.nix +++ b/flake.nix @@ -83,20 +83,14 @@ }; }; - devShells.default = pkgs.mkShellNoCC { - nativeBuildInputs = [ + devShells.default = pkgs.mkShell { + inputsFrom = [ + config.pre-commit.devShell + ]; + nativeBuildInputs = with pkgs; [ inputs'.sops-nix.packages.sops-import-keys-hook inputs'.disko.packages.disko - # formatter + linter - pkgs.deadnix - pkgs.nixpkgs-fmt - pkgs.shellcheck - pkgs.statix - pkgs.typos ]; - shellHook = '' - ${config.pre-commit.installationScript} - ''; }; }; # flake = {};