-
Notifications
You must be signed in to change notification settings - Fork 362
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feature/treefmt - integrate treefmt-nix #1679
Draft
jmuchovej
wants to merge
9
commits into
cachix:main
Choose a base branch
from
jmuchovej:feature/treefmt
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+178
−72
Draft
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
fb7cdef
docs(treefmt): add integration guide for treefmt with devenv
use-the-fork 52e88f7
feat(flake): add treefmt-nix url to pre-commit-hooks configuration
use-the-fork e7d324a
feat(devenv.nix): move and expand just block, add treefmt configurati…
use-the-fork 2dbaaef
feature(devenv): add treefmt integration
use-the-fork 0c15cfa
docs: update README and treefmt documentation with formatting changes
use-the-fork 5c06fe8
Merge branch 'cachix:main' into feature/treefmt
use-the-fork 1435788
Merge branch 'cachix:main' into feature/treefmt
use-the-fork 7e2b7a4
chore: bringing branch up-to-date
jmuchovej d433fbc
Merge branch 'cachix:main' into feature/treefmt
jmuchovej File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -250,3 +250,4 @@ EOF | |
}; | ||
}; | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,11 +3,12 @@ | |
let | ||
__DEVENV_VARS__ | ||
in { | ||
treefmt-nix.url = "github:numtide/treefmt-nix"; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Let's not add it by default, not many will use it so it should be optional. |
||
git-hooks.url = "github:cachix/git-hooks.nix"; | ||
git-hooks.inputs.nixpkgs.follows = "nixpkgs"; | ||
pre-commit-hooks.follows = "git-hooks"; | ||
nixpkgs.url = "github:cachix/devenv-nixpkgs/rolling"; | ||
devenv.url = "github:cachix/devenv?dir=src/modules"; | ||
git-hooks.inputs.nixpkgs.follows = "nixpkgs"; | ||
pre-commit-hooks.follows = "git-hooks"; | ||
nixpkgs.url = "github:cachix/devenv-nixpkgs/rolling"; | ||
devenv.url = "github:cachix/devenv?dir=src/modules"; | ||
} // (if builtins.pathExists (devenv_dotfile + "/flake.json") | ||
then builtins.fromJSON (builtins.readFile (devenv_dotfile + "/flake.json")) | ||
else { }); | ||
|
@@ -135,3 +136,4 @@ | |
devShell."${system}" = config.shell; | ||
}; | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,73 @@ | ||
# `devenv` Integration for [treefmt](https://treefmt.com/) via [treefmt-nix](https://github.com/numtide/treefmt-nix) | ||
|
||
## Set up | ||
|
||
Check the available integrations in [the list of all available integrations](reference/options.md#treefmt). | ||
|
||
Add your desired integration to your `devenv.nix` file. For example, the following code would enable `treefmt` with the `nixpkgs-fmt` and `rustfmt` integrations: | ||
|
||
```nix | ||
{ inputs, ... }: | ||
|
||
{ | ||
treefmt = { | ||
projectRootFile = "devenv.nix"; | ||
programs = { | ||
nixpkgs-fmt.enable = true; | ||
rustfmt.enable = true; | ||
}; | ||
}; | ||
} | ||
``` | ||
|
||
### In Action: | ||
|
||
```shell-session | ||
$ devenv shell | ||
Building shell ... | ||
Entering shell ... | ||
|
||
treefmt # This would run treefmt on all files. | ||
``` | ||
|
||
## Additional Devenv Integrations | ||
|
||
### Pre-commit Hooks | ||
|
||
If you would like to enable `treefmt` in your pre-commit hooks, simply add: | ||
|
||
```nix | ||
{ inputs, ... }: | ||
|
||
{ | ||
pre-commit.hooks = { | ||
treefmt.enable = true; | ||
}; | ||
} | ||
``` | ||
|
||
This will enable `treefmt` hooks and automatically change the default package to the one you have defined in your `devenv`. | ||
|
||
## Using a Custom Formatter | ||
|
||
It is also possible to use custom formatters with `treefmt-nix`. For example, the following custom formatter formats JSON files using `yq-go`: | ||
|
||
```nix | ||
{ | ||
treefmt.settings.formatter = { | ||
"yq-json" = { | ||
command = "${pkgs.bash}/bin/bash"; | ||
options = [ | ||
"-euc" | ||
'' | ||
for file in "$@"; do | ||
${lib.getExe yq-go} -i --output-format=json $file | ||
done | ||
'' | ||
"--" # bash swallows the second argument when using -c | ||
]; | ||
includes = [ "*.json" ]; | ||
}; | ||
}; | ||
} | ||
``` |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same here, not that important feature to be in the README