aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.nix2
-rw-r--r--nix/dev.nix38
2 files changed, 19 insertions, 21 deletions
diff --git a/flake.nix b/flake.nix
index 8f31ccec..d45282aa 100644
--- a/flake.nix
+++ b/flake.nix
@@ -25,6 +25,8 @@
{inherit inputs;}
{
imports = [
+ inputs.pre-commit-hooks.flakeModule
+
./nix/dev.nix
./nix/distribution.nix
];
diff --git a/nix/dev.nix b/nix/dev.nix
index a9c1dc65..c476ed10 100644
--- a/nix/dev.nix
+++ b/nix/dev.nix
@@ -1,37 +1,33 @@
{
- inputs,
- self,
- ...
-}: {
perSystem = {
- system,
+ config,
+ lib,
pkgs,
...
}: {
- checks = {
- pre-commit-check = inputs.pre-commit-hooks.lib.${system}.run {
- src = self;
- hooks = {
- markdownlint.enable = true;
+ pre-commit.settings = {
+ hooks = {
+ markdownlint.enable = true;
- alejandra.enable = true;
- deadnix.enable = true;
- nil.enable = true;
+ alejandra.enable = true;
+ deadnix.enable = true;
+ nil.enable = true;
- clang-format = {
- enable = true;
- types_or = ["c" "c++" "java" "json" "objective-c"];
- };
+ clang-format = {
+ enable = true;
+ types_or = ["c" "c++" "java" "json" "objective-c"];
};
-
- tools.clang-tools = pkgs.clang-tools_16;
};
+
+ tools.clang-tools = lib.mkForce pkgs.clang-tools_16;
};
devShells.default = pkgs.mkShell {
- inherit (self.checks.${system}.pre-commit-check) shellHook;
+ shellHook = ''
+ ${config.pre-commit.installationScript}
+ '';
- inputsFrom = [self.packages.${system}.prismlauncher-unwrapped];
+ inputsFrom = [config.packages.prismlauncher-unwrapped];
buildInputs = with pkgs; [ccache ninja];
};