Compare commits

...

2 Commits

Author SHA1 Message Date
reed 0d1a37eef3 feat: add treefmt to flake root 2026-06-07 21:58:16 -05:00
reed ba2dce4b85 style: treefmt options format fix 2026-06-07 21:55:15 -05:00
7 changed files with 35 additions and 14 deletions
+8
View File
@@ -0,0 +1,8 @@
[global]
disable = [
# line length limits
"MD013",
]
[MD057]
absolute-links = "relative_to_roots"
+2 -2
View File
@@ -155,8 +155,8 @@
};
# Formatter for nix files, available through 'nix fmt'
treefmt = lib.mkIf cfg.formatter.enable {
programs.alejandra.enable = lib.mkIf cfg.formatter.nix true;
treefmt.programs = lib.mkIf cfg.formatter.enable {
alejandra.enable = lib.mkIf cfg.formatter.nix true;
};
};
});
+9 -1
View File
@@ -36,6 +36,7 @@
./rust
./rust-esp32-c6
inputs.treefmt-nix.flakeModule
flake-parts.flakeModules.flakeModules
# define the flake.templates option
({lib, ...}: {
@@ -57,6 +58,13 @@
systems = ["aarch64-linux" "x86_64-linux" "aarch64-darwin"];
perSystem = {pkgs, ...}: {formatter = pkgs.alejandra;};
perSystem = {pkgs, ...}: {
treefmt.programs = {
alejandra.enable = true; # nix
taplo.enable = true; # toml
rumdl-check.enable = true; # markdown
rumdl-format.enable = true; # markdown
};
};
};
}
+10 -5
View File
@@ -45,7 +45,8 @@
# all of that work (e.g. via cachix) when running in CI
cargoArtifacts = craneLib.buildDepsOnly ({
inherit src buildInputs nativeBuildInputs;
} // cfg.cargoArtifacts.extraAttrs);
}
// cfg.cargoArtifacts.extraAttrs);
in {
options.krantz.rust = {
enable = lib.mkEnableOption "building a cargo project with crane";
@@ -66,7 +67,11 @@
srcToolchain = lib.mkOption {
description = "A path to the rust-toolchain(.toml) file for the repo. Will use the toolchain from nixpkgs if the file does not exist.";
type = lib.types.path;
default = "${if cfg.src != null then cfg.src else "/dev/null"}/rust-toolchain.toml";
default = "${
if cfg.src != null
then cfg.src
else "/dev/null"
}/rust-toolchain.toml";
defaultText = lib.literalExpression "cfg.src + \"/rust-toolchain.toml\"";
example = lib.literalExpression "./rust-toolchain";
};
@@ -192,10 +197,10 @@
# Your custom packages
# Accessible through 'nix build', 'nix shell', 'nix run', etc
packages = lib.mkIf cfg.package.enable {
${cfg.package.name} =
craneLib.buildPackage ({
${cfg.package.name} = craneLib.buildPackage ({
inherit src buildInputs nativeBuildInputs cargoArtifacts;
} // cfg.package.extraAttrs);
}
// cfg.package.extraAttrs);
};
# Formatter for nix files, available through 'nix fmt'