Skip to content

Commit 66aa9b0

Browse files
committed
Merge branch 'feature/repo-maintenance' into develop
2 parents 53e5013 + 46ec7ff commit 66aa9b0

19 files changed

+313
-227
lines changed

.editorconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ trim_trailing_whitespace = false
2323
indent_size = 2
2424
# NOTE: The README.md contains some examples with URLs being too long to fit on
2525
# 80-character lines.
26-
max_line_length = 100
26+
max_line_length = 120

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# Rust build directory
99
/target/
1010

11-
# Nix build ouptut.
11+
# Nix build output.
1212
/result
1313

1414
##

.prettierignore

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
*.lock
2+
*.md
3+
*.wxs

.vscode/extensions.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
"recommendations": [
33
"cab404.vscode-direnv",
44
"editorconfig.editorconfig",
5+
"esbenp.prettier-vscode",
6+
"fill-labs.dependi",
57
"jnoortheen.nix-ide",
68
"rust-lang.rust-analyzer",
7-
"serayuzgur.crates",
89
"stkb.rewrap",
910
"tamasfe.even-better-toml",
1011
"tekumara.typos-vscode"

.vscode/settings.json

+15-7
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
{
22
"editor.formatOnSave": true,
3-
"editor.rulers": [
4-
80
5-
],
3+
"editor.rulers": [80],
64
"evenBetterToml.taplo.bundled": false,
75
"files.insertFinalNewline": true,
86
"files.trimFinalNewlines": true,
@@ -12,13 +10,23 @@
1210
"nix.serverSettings": {
1311
"nixd": {
1412
"formatting": {
15-
"command": [
16-
"nixpkgs-fmt"
17-
]
13+
"command": ["nixpkgs-fmt"]
1814
}
1915
}
2016
},
2117
"rewrap.autoWrap.enabled": true,
2218
"rust-analyzer.check.command": "clippy",
23-
"rust-analyzer.server.path": "rust-analyzer"
19+
"rust-analyzer.server.path": "rust-analyzer",
20+
"[json]": {
21+
"editor.defaultFormatter": "esbenp.prettier-vscode"
22+
},
23+
"[jsonc]": {
24+
"editor.defaultFormatter": "esbenp.prettier-vscode"
25+
},
26+
"[markdown]": {
27+
"editor.formatOnSave": false
28+
},
29+
"[yaml]": {
30+
"editor.defaultFormatter": "esbenp.prettier-vscode"
31+
}
2432
}

CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ in the current repository.
142142
* the valid ticket prefixes,
143143
* the commit template.
144144

145-
[Unreleased]: https://github.com/ejpcmac/git-z/compare/develop...main
145+
[Unreleased]: https://github.com/ejpcmac/git-z/compare/main...develop
146146
[0.2.1]: https://github.com/ejpcmac/git-z/compare/v0.2.0...v0.2.1
147147
[0.2.0]: https://github.com/ejpcmac/git-z/compare/v0.1.0...v0.2.0
148148
[0.1.0]: https://github.com/ejpcmac/git-z/releases/tag/v0.1.0

CONTRIBUTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ Install:
8282
* `committed`,
8383
* `eclint`,
8484
* `nixpkgs-fmt`,
85+
* `prettier`,
8586
* `taplo`,
8687
* `typos`,
87-
* `yamlfmt`,
8888
* optionally `git-flow`.
8989

9090
### Checking that everything works
@@ -161,7 +161,7 @@ Please format your code with the following tools:
161161
* Rust with `rustfmt`,
162162
* Nix with `nixpkgs-fmt`,
163163
* TOML with `taplo`,
164-
* YAML with `yamlfmt`.
164+
* YAML and JSON with `prettier`.
165165

166166
All contributed code must be documented. In general, take your inspiration from
167167
the existing code.

0 commit comments

Comments
 (0)