Skip to content

Commit 674832a

Browse files
committed
flake.nix: add treefmt nix
Easier to format everything properly.
1 parent 569445f commit 674832a

File tree

2 files changed

+37
-2
lines changed

2 files changed

+37
-2
lines changed

flake.lock

+22-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

+15-1
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,13 @@
77
url = "github:edolstra/flake-compat";
88
flake = false;
99
};
10+
treefmt-nix = {
11+
url = "github:numtide/treefmt-nix";
12+
inputs.nixpkgs.follows = "nixpkgs";
13+
};
1014
};
1115

12-
outputs = { self, nixpkgs, ... }:
16+
outputs = { self, nixpkgs, treefmt-nix, ... }:
1317
let
1418
inherit (nixpkgs) lib;
1519
genSystems = func: lib.genAttrs [
@@ -28,6 +32,14 @@
2832
(builtins.substring 4 2 longDate)
2933
(builtins.substring 6 2 longDate)
3034
]);
35+
36+
treefmtEval = genSystems (pkgs: treefmt-nix.lib.evalModule pkgs {
37+
# Formatting configuration
38+
programs = {
39+
clang-format.enable = true;
40+
nixfmt.enable = true;
41+
};
42+
});
3143
in
3244
{
3345
devShells = genSystems
@@ -51,6 +63,8 @@
5163
};
5264
});
5365

66+
formatter = genSystems (pkgs: treefmtEval.${pkgs.system}.config.build.wrapper);
67+
5468
overlays = {
5569
default = self.overlays.waybar;
5670
waybar = final: prev: {

0 commit comments

Comments
 (0)