diff --git a/flake.nix b/flake.nix index e3085eb..68f3f4b 100644 --- a/flake.nix +++ b/flake.nix @@ -27,13 +27,16 @@ mkShellHook = { system , pkgs + , conform ? { } , rust ? { } , ... }: let rustDefaults = { enable = false; }; + conformDefaults = { scopes = [ ]; }; configs = import ./src/configs/default.nix { inherit system pkgs nixago nixago-exts; + conform = conformDefaults // conform; rust = rustDefaults // rust; }; in diff --git a/src/configs/conform.nix b/src/configs/conform.nix index 188111d..fa0d8b6 100644 --- a/src/configs/conform.nix +++ b/src/configs/conform.nix @@ -1,7 +1,9 @@ -inputs @ { system, nixago, nixago-exts, ... }: +inputs @ { system, nixago-exts, conform, ... }: nixago-exts.conform.${system} { commit = { - header = { length = inputs.pkgs.lib.debug.traceVal 89; }; + header.length = 89; + scopes = conform.scopes; + conventional = { types = [ "build" @@ -15,8 +17,6 @@ nixago-exts.conform.${system} { "style" "test" ]; - - scopes = [ "cli" ]; }; }; } diff --git a/src/configs/treefmt.nix b/src/configs/treefmt.nix index caed577..49b1949 100644 --- a/src/configs/treefmt.nix +++ b/src/configs/treefmt.nix @@ -3,7 +3,7 @@ let data = { formatter = { nix = { - command = "nixpkgs-fmt"; + command = "${pkgs.nixpkgs-fmt}/bin/nixpkgs-fmt"; includes = [ "*.nix" ]; };