From d479add40865e88f2994b393813351ec030e763d Mon Sep 17 00:00:00 2001 From: rxyhn Date: Mon, 8 Jan 2024 08:18:53 +0700 Subject: [PATCH] [chore]: update --- flake.nix | 4 +++- pre-commit-hooks.nix => flake/pre-commit-hooks.nix | 3 +++ treefmt.nix => flake/treefmt.nix | 6 ++++-- 3 files changed, 10 insertions(+), 3 deletions(-) rename pre-commit-hooks.nix => flake/pre-commit-hooks.nix (81%) rename treefmt.nix => flake/treefmt.nix (79%) diff --git a/flake.nix b/flake.nix index c3c7b0d0..733aeecf 100644 --- a/flake.nix +++ b/flake.nix @@ -72,12 +72,14 @@ systems = ["x86_64-linux"]; imports = [ + ./flake/pre-commit-hooks.nix + ./flake/treefmt.nix + ./home/profiles ./hosts ./lib ./modules ./pkgs - ./pre-commit-hooks.nix ./treefmt.nix ]; diff --git a/pre-commit-hooks.nix b/flake/pre-commit-hooks.nix similarity index 81% rename from pre-commit-hooks.nix rename to flake/pre-commit-hooks.nix index ec90b89b..dd10e68f 100644 --- a/pre-commit-hooks.nix +++ b/flake/pre-commit-hooks.nix @@ -2,10 +2,13 @@ imports = [inputs.pre-commit-hooks.flakeModule]; perSystem.pre-commit = { + check.enable = true; + settings.excludes = ["flake.lock"]; settings.hooks = { alejandra.enable = true; + actionlint.enable = true; prettier.enable = true; treefmt.enable = true; }; diff --git a/treefmt.nix b/flake/treefmt.nix similarity index 79% rename from treefmt.nix rename to flake/treefmt.nix index 9e471ec7..f63f6cec 100644 --- a/treefmt.nix +++ b/flake/treefmt.nix @@ -6,11 +6,13 @@ programs = { alejandra.enable = true; - black.enable = true; deadnix.enable = true; prettier.enable = true; shellcheck.enable = true; - shfmt.enable = true; + shfmt = { + enable = true; + indent_size = 2; + }; }; }; }