From 68ab7cc81a0027d9736ad1eb9ae3ba0bd95e18ac Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Tue, 7 Jan 2025 15:56:01 +0100 Subject: [PATCH 1/2] fix(formatter): ignore treefmt.toml --- templates/default/.gitignore | 4 ++-- templates/default/nix/formatter.nix | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/templates/default/.gitignore b/templates/default/.gitignore index a343c6d..bc14aa7 100644 --- a/templates/default/.gitignore +++ b/templates/default/.gitignore @@ -11,6 +11,7 @@ result-* target/ # nixago: ignore-linked-files +/treefmt.toml treefmt.toml # nats @@ -20,5 +21,4 @@ rust/*/*/test_leaf_server.conf rust/*/*/leaf_server.conf rust/*/*/resolver.conf leaf_server.conf -.local - +.local \ No newline at end of file diff --git a/templates/default/nix/formatter.nix b/templates/default/nix/formatter.nix index 34ddf09..1308b56 100644 --- a/templates/default/nix/formatter.nix +++ b/templates/default/nix/formatter.nix @@ -34,6 +34,9 @@ let "LICENSE" # unsupported extensions "*.{gif,png,svg,tape,mts,lock,mod,sum,env,envrc,gitignore}" + + # link to a read-only store-path + "treefmt.toml" ]; formatter = { From ea2c17ddedc64626316ba73ae5be1bb6c95607e8 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Tue, 7 Jan 2025 15:56:06 +0100 Subject: [PATCH 2/2] fix(gitignore): remove overly specific ignore entries --- templates/default/.gitignore | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/templates/default/.gitignore b/templates/default/.gitignore index bc14aa7..02a869d 100644 --- a/templates/default/.gitignore +++ b/templates/default/.gitignore @@ -1,3 +1,6 @@ +# generic +.local + # direnv .direnv/ .env @@ -9,16 +12,8 @@ result-* # rust target/ +.cargo/ # nixago: ignore-linked-files /treefmt.toml treefmt.toml - -# nats -rust/*/tmp -rust/*/jwt -rust/*/*/test_leaf_server.conf -rust/*/*/leaf_server.conf -rust/*/*/resolver.conf -leaf_server.conf -.local \ No newline at end of file