Merge pull request 'feat/configure-treefmt-pipeline' (#32) from feat/configure-treefmt-pipeline into main

Reviewed-on: #32
This commit is contained in:
Brian McGee 2024-05-01 10:20:10 +00:00
commit d3cdb698e4
4 changed files with 42 additions and 21 deletions

View File

@ -208,15 +208,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1707300477, "lastModified": 1714382886,
"narHash": "sha256-qQF0fEkHlnxHcrKIMRzOETnRBksUK048MXkX0SOmxvA=", "narHash": "sha256-+gooxbbYcP+MORKQ7W/C2ATvlonW+dyHgCUPnu5dfco=",
"owner": "numtide", "owner": "brianmcgee",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "ac599dab59a66304eb511af07b3883114f061b9d", "rev": "535e6904c34964ce56d8c092835c11fe6341acc8",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "numtide", "owner": "brianmcgee",
"ref": "feat/pipelines",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"type": "github" "type": "github"
} }

View File

@ -7,7 +7,8 @@
flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.url = "github:hercules-ci/flake-parts";
flake-root.url = "github:srid/flake-root"; flake-root.url = "github:srid/flake-root";
treefmt-nix = { treefmt-nix = {
url = "github:numtide/treefmt-nix"; # todo switch back to numtide/treefmt-nix once merged
url = "github:brianmcgee/treefmt-nix/feat/pipelines";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
devshell = { devshell = {

View File

@ -23,7 +23,9 @@
in in
filter { filter {
root = ../.; root = ../.;
exclude = [./nix]; exclude = [
"nix"
];
}; };
modules = ../gomod2nix.toml; modules = ../gomod2nix.toml;

View File

@ -22,20 +22,37 @@
statix.enable = true; statix.enable = true;
}; };
settings.formatter.prettier = { settings.formatter = {
options = ["--tab-width" "4"]; deadnix = {
includes = [ pipeline = "nix";
"*.css" priority = 1;
"*.html" };
"*.js"
"*.json" statix = {
"*.jsx" pipeline = "nix";
"*.md" priority = 2;
"*.mdx" };
"*.scss"
"*.ts" alejandra = {
"*.yaml" pipeline = "nix";
]; priority = 3;
};
prettier = {
options = ["--tab-width" "4"];
includes = [
"*.css"
"*.html"
"*.js"
"*.json"
"*.jsx"
"*.md"
"*.mdx"
"*.scss"
"*.ts"
"*.yaml"
];
};
}; };
}; };