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"
+1 -1
View File
@@ -1,3 +1,3 @@
# project-templates # project-templates
Nix flake templates for initializing new projects. Nix flake templates for initializing new projects.
+2 -2
View File
@@ -155,8 +155,8 @@
}; };
# Formatter for nix files, available through 'nix fmt' # Formatter for nix files, available through 'nix fmt'
treefmt = lib.mkIf cfg.formatter.enable { treefmt.programs = lib.mkIf cfg.formatter.enable {
programs.alejandra.enable = lib.mkIf cfg.formatter.nix true; alejandra.enable = lib.mkIf cfg.formatter.nix true;
}; };
}; };
}); });
+9 -1
View File
@@ -36,6 +36,7 @@
./rust ./rust
./rust-esp32-c6 ./rust-esp32-c6
inputs.treefmt-nix.flakeModule
flake-parts.flakeModules.flakeModules flake-parts.flakeModules.flakeModules
# define the flake.templates option # define the flake.templates option
({lib, ...}: { ({lib, ...}: {
@@ -57,6 +58,13 @@
systems = ["aarch64-linux" "x86_64-linux" "aarch64-darwin"]; 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
};
};
}; };
} }
+2 -2
View File
@@ -1,7 +1,7 @@
[global] [global]
disable = [ disable = [
# line length limits # line length limits
"MD013", "MD013",
] ]
[MD057] [MD057]
+11 -6
View File
@@ -44,8 +44,9 @@
# Build *just* the cargo dependencies, so we can reuse # Build *just* the cargo dependencies, so we can reuse
# all of that work (e.g. via cachix) when running in CI # all of that work (e.g. via cachix) when running in CI
cargoArtifacts = craneLib.buildDepsOnly ({ cargoArtifacts = craneLib.buildDepsOnly ({
inherit src buildInputs nativeBuildInputs; inherit src buildInputs nativeBuildInputs;
} // cfg.cargoArtifacts.extraAttrs); }
// cfg.cargoArtifacts.extraAttrs);
in { in {
options.krantz.rust = { options.krantz.rust = {
enable = lib.mkEnableOption "building a cargo project with crane"; enable = lib.mkEnableOption "building a cargo project with crane";
@@ -66,7 +67,11 @@
srcToolchain = lib.mkOption { 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."; 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; 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\""; defaultText = lib.literalExpression "cfg.src + \"/rust-toolchain.toml\"";
example = lib.literalExpression "./rust-toolchain"; example = lib.literalExpression "./rust-toolchain";
}; };
@@ -192,10 +197,10 @@
# Your custom packages # Your custom packages
# Accessible through 'nix build', 'nix shell', 'nix run', etc # Accessible through 'nix build', 'nix shell', 'nix run', etc
packages = lib.mkIf cfg.package.enable { packages = lib.mkIf cfg.package.enable {
${cfg.package.name} = ${cfg.package.name} = craneLib.buildPackage ({
craneLib.buildPackage ({
inherit src buildInputs nativeBuildInputs cargoArtifacts; inherit src buildInputs nativeBuildInputs cargoArtifacts;
} // cfg.package.extraAttrs); }
// cfg.package.extraAttrs);
}; };
# Formatter for nix files, available through 'nix fmt' # Formatter for nix files, available through 'nix fmt'
+2 -2
View File
@@ -1,7 +1,7 @@
[global] [global]
disable = [ disable = [
# line length limits # line length limits
"MD013", "MD013",
] ]
[MD057] [MD057]