From 6eb9b21842e2796bcc2caf36b9e5abf0fbc868ac Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Mon, 30 Dec 2024 12:42:20 +0100 Subject: [PATCH 1/2] git: ignore treefmt.toml --- templates/default/.gitignore | 2 +- templates/default/treefmt.toml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 120000 templates/default/treefmt.toml diff --git a/templates/default/.gitignore b/templates/default/.gitignore index ae0badb..a343c6d 100644 --- a/templates/default/.gitignore +++ b/templates/default/.gitignore @@ -11,7 +11,7 @@ result-* target/ # nixago: ignore-linked-files -/treefmt.toml +treefmt.toml # nats rust/*/tmp diff --git a/templates/default/treefmt.toml b/templates/default/treefmt.toml deleted file mode 120000 index e440515..0000000 --- a/templates/default/treefmt.toml +++ /dev/null @@ -1 +0,0 @@ -/nix/store/2q0p32grc9y40gilz6z9ck5nmq5ypx4n-treefmt.toml \ No newline at end of file From 3237bbad0ace2e66e7d3d2817a29a38e6d7f10c3 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Mon, 30 Dec 2024 12:42:51 +0100 Subject: [PATCH 2/2] feat,chore(formatter): don't exclude TOML and use taplo for it --- templates/default/Cargo.toml | 4 +--- templates/default/nix/formatter.nix | 4 +++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/default/Cargo.toml b/templates/default/Cargo.toml index 8a28e34..f95357a 100644 --- a/templates/default/Cargo.toml +++ b/templates/default/Cargo.toml @@ -3,9 +3,7 @@ resolver = "2" package.version = "0.1.0" metadata.crane.name = "blueprint-universe" -members = [ - "rust/*", -] +members = ["rust/*"] [workspace.dependencies] anyhow = "1.0" diff --git a/templates/default/nix/formatter.nix b/templates/default/nix/formatter.nix index e29bc08..34ddf09 100644 --- a/templates/default/nix/formatter.nix +++ b/templates/default/nix/formatter.nix @@ -24,6 +24,8 @@ let shfmt.enable = true; + taplo.enable = true; + prettier.enable = true; } // pkgs.lib.optionalAttrs (pkgs.system != "riscv64-linux") { shellcheck.enable = true; }; @@ -31,7 +33,7 @@ let global.excludes = [ "LICENSE" # unsupported extensions - "*.{gif,png,svg,tape,mts,lock,mod,sum,toml,env,envrc,gitignore}" + "*.{gif,png,svg,tape,mts,lock,mod,sum,env,envrc,gitignore}" ]; formatter = {