Skip to content

Commit 3fdb3f3

Browse files
committed
feat: add treefmt
1 parent 1c63b65 commit 3fdb3f3

File tree

2 files changed

+38
-15
lines changed

2 files changed

+38
-15
lines changed

flake.nix

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -50,29 +50,22 @@
5050
];
5151

5252
packages = with pkgs; [
53-
prettierd
53+
nodePackages_latest.prettier
5454
tailwindcss-language-server
5555
];
5656

5757
processes = {
5858
dev.exec = "npm run dev";
5959
};
6060

61-
scripts = {
62-
format.exec = "npm run format";
63-
};
64-
6561
git-hooks.hooks = {
6662
shellcheck.enable = true;
67-
nixfmt-rfc-style.enable = true;
68-
prettier = {
69-
enable = true;
70-
excludes = [
71-
"flake.lock"
72-
"package-lock.json"
73-
"README.md"
74-
];
75-
};
63+
treefmt.enable = true;
64+
treefmt.settings.formatters = with pkgs; [
65+
nodePackages_latest.prettier
66+
nixfmt-rfc-style
67+
taplo
68+
];
7669
};
7770

7871
languages = {
@@ -85,7 +78,7 @@
8578
};
8679
};
8780

88-
formatter = pkgs.nixfmt-rfc-style;
81+
formatter = pkgs.treefmt;
8982
};
9083
};
9184
}

treefmt.toml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
excludes = ["package-lock.json", ".gitignore"]
2+
3+
[formatter.prettier]
4+
command = "prettier"
5+
excludes = []
6+
includes = [
7+
"*.cjs",
8+
"*.css",
9+
"*.html",
10+
"*.js",
11+
"*.json",
12+
"*.json5",
13+
"*.jsx",
14+
"*.md",
15+
"*.mdx",
16+
"*.mjs",
17+
"*.scss",
18+
"*.ts",
19+
"*.tsx",
20+
"*.vue",
21+
"*.yaml",
22+
"*.yml",
23+
]
24+
options = ["--write"]
25+
26+
[formatter.taplo]
27+
command = "taplo"
28+
excludes = []
29+
includes = ["*.toml"]
30+
options = ["format"]

0 commit comments

Comments
 (0)