reed/project-templates
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: reed/project-templates:master
Branches Tags
reed/project-templates:master
..
compare: reed/project-templates:25609ea02552d0885db8fee2f3dbe52b76fba7e1
Branches Tags
reed/project-templates:master
1 Commits
master .. 25609ea025
Author SHA1 Message Date
reed 25609ea025 feat(rust-esp32-c6): make the rust-esp32-c6 template 2026-06-04 20:20:48 -05:00
14 changed files with 50 additions and 118 deletions
Expand all files Collapse all files
.rumdl.toml
-8
View File
@@ -1,8 +0,0 @@
[global]
disable = [
# line length limits
"MD013",
]
[MD057]
absolute-links = "relative_to_roots"
cad/default.nix
+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.programs = lib.mkIf cfg.formatter.enable { treefmt = lib.mkIf cfg.formatter.enable {
alejandra.enable = lib.mkIf cfg.formatter.nix true; programs.alejandra.enable = lib.mkIf cfg.formatter.nix true;
}; };
}; };
}); });
flake.lock
Generated
+18 -18
View File
@@ -95,11 +95,11 @@
}, },
"crane": { "crane": {
"locked": { "locked": {
"lastModified": 1781825982, "lastModified": 1777335812,
"narHash": "sha256-SlXKwIRIhrOSAcTjCB3ftPLzJWZStQIPS7J1FlZPnKk=", "narHash": "sha256-bEg5xoAxAwsyfnGhkEX7RJViTIBIYPd8ISg4O1c0HFc=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "469fd08d0bcf6926321fa973c6777fbc87785dd7", "rev": "5e0fb2f64edff2822249f21293b8304dedaaf676",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -113,11 +113,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1778716662, "lastModified": 1775087534,
"narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -162,11 +162,11 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1777168982, "lastModified": 1774748309,
"narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=", "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14", "rev": "333c4e0545a6da976206c74db8773a1645b5870a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -177,11 +177,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1782723713, "lastModified": 1777268161,
"narHash": "sha256-oPXCU/SSUokcGaJREHibG1CBX3+s/W7orDWQOZDsEeQ=", "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b5aa0fbd538984f6e3d201be0005b4463d8b09f8", "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -273,11 +273,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1782789458, "lastModified": 1780197589,
"narHash": "sha256-CR55gKCChD9ffN1Ag5az20Z3RD4tylHlcM1SSohkMA8=", "narHash": "sha256-FVCr2Ij/jKf59a4LW481eeOF6rJRreOBrVgW/aUBTrw=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "067959ef838c440558ca519cf08ca87f43c3db3a", "rev": "21632e942d89bf1cce4e5a63d7e58a215a0cbfcc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -308,11 +308,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1780220602, "lastModified": 1775636079,
"narHash": "sha256-eynAfOmbmxJnkp7YewvCEbShNnnYJ9gLLqkzsYtBPeM=", "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "db947814a175b7ca6ded66e21383d938df01c227", "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba",
"type": "github" "type": "github"
}, },
"original": { "original": {
flake.nix
+1 -9
View File
@@ -36,7 +36,6 @@
./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, ...}: {
@@ -58,13 +57,6 @@
systems = ["aarch64-linux" "x86_64-linux" "aarch64-darwin"]; systems = ["aarch64-linux" "x86_64-linux" "aarch64-darwin"];
perSystem = {pkgs, ...}: { perSystem = {pkgs, ...}: {formatter = pkgs.alejandra;};
treefmt.programs = {
alejandra.enable = true; # nix
taplo.enable = true; # toml
rumdl-check.enable = true; # markdown
rumdl-format.enable = true; # markdown
};
};
}; };
} }
rust-esp32-c6/default.nix
-8
View File
@@ -37,14 +37,6 @@
krantz.rust.devDeps = lib.mkOptionDefault (with pkgs; [ krantz.rust.devDeps = lib.mkOptionDefault (with pkgs; [
espflash espflash
]); ]);
krantz.rust.cargoArtifacts.extraAttrs = lib.mkOptionDefault {
doCheck = false;
};
krantz.rust.package.extraAttrs = lib.mkOptionDefault {
doCheck = false;
};
}; };
}); });
}; };
rust-esp32-c6/template/.cargo/config.toml
+1 -2
View File
@@ -8,8 +8,7 @@ DEFMT_LOG = "info"
rustflags = [ rustflags = [
# Required to obtain backtraces (e.g. when using the "esp-backtrace" crate.) # Required to obtain backtraces (e.g. when using the "esp-backtrace" crate.)
# NOTE: May negatively impact performance of produced code # NOTE: May negatively impact performance of produced code
"-C", "-C", "force-frame-pointers",
"force-frame-pointers",
] ]
target = "riscv32imac-unknown-none-elf" target = "riscv32imac-unknown-none-elf"
rust-esp32-c6/template/.rumdl.toml
-8
View File
@@ -1,8 +0,0 @@
[global]
disable = [
# line length limits
"MD013",
]
[MD057]
absolute-links = "relative_to_roots"
rust-esp32-c6/template/flake.nix
+1 -1
View File
@@ -7,7 +7,7 @@
flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.url = "github:hercules-ci/flake-parts";
project-templates = { project-templates = {
url = "git+https://git.krantz.one/reed/project-templates"; url = "git+file:///home/reed/code/project-templates";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-parts.follows = "flake-parts"; inputs.flake-parts.follows = "flake-parts";
}; };
rust/default.nix
+13 -41
View File
@@ -29,7 +29,7 @@
manifest = (lib.importTOML "${src}/Cargo.toml").package; manifest = (lib.importTOML "${src}/Cargo.toml").package;
craneLib = craneLib =
if cfg.srcToolchain != null && builtins.pathExists cfg.srcToolchain if builtins.pathExists cfg.srcToolchain
then then
(inputs.crane.mkLib (pkgs.extend inputs.rust-overlay.overlays.default)).overrideToolchain ( (inputs.crane.mkLib (pkgs.extend inputs.rust-overlay.overlays.default)).overrideToolchain (
p: p.rust-bin.fromRustupToolchainFile cfg.srcToolchain p: p.rust-bin.fromRustupToolchainFile cfg.srcToolchain
@@ -43,10 +43,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);
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";
@@ -61,26 +60,14 @@
description = "A path to the filtered directory of the root of the crate."; description = "A path to the filtered directory of the root of the crate.";
type = lib.types.path; type = lib.types.path;
default = craneLib.cleanCargoSource cfg.src; default = craneLib.cleanCargoSource cfg.src;
defaultText = lib.literalExpression "config.krantz.rust.craneLib.cleanCargoSource cfg.src"; defaultText = lib.literalExpression "config.krantz.rust.craneLib cfg.src";
example = lib.literalExpression "./."; example = lib.literalExpression "./.";
}; };
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.nullOr lib.types.path; type = lib.types.path;
default = default = "${if cfg.src != null then cfg.src else "/dev/null"}/rust-toolchain.toml";
if cfg.src != null defaultText = lib.literalExpression "cfg.src + \"/rust-toolchain.toml\"";
then cfg.src + "/rust-toolchain.toml"
else null;
defaultText =
lib.literalExpression
/*
nix
*/
''
if cfg.src != null
then cfg.src + "/rust-toolchain.toml"
else null;
'';
example = lib.literalExpression "./rust-toolchain"; example = lib.literalExpression "./rust-toolchain";
}; };
@@ -109,17 +96,6 @@
]; ];
}; };
cargoArtifacts = {
extraAttrs = lib.mkOption {
description = "Extra attributes to merge into buildDepsOnly. See https://crane.dev/API.html#cranelibbuilddepsonly";
type = lib.types.attrs;
default = {};
example = {
doCheck = false;
};
};
};
devShell = { devShell = {
enable = lib.mkEnableOption "a rust development environment" // {default = true;}; enable = lib.mkEnableOption "a rust development environment" // {default = true;};
@@ -167,8 +143,6 @@
nix = lib.mkEnableOption "formatting for nix files" // {default = true;}; nix = lib.mkEnableOption "formatting for nix files" // {default = true;};
rust = lib.mkEnableOption "formatting for rust files" // {default = true;}; rust = lib.mkEnableOption "formatting for rust files" // {default = true;};
toml = lib.mkEnableOption "formatting for toml files" // {default = true;};
markdown = lib.mkEnableOption "formatting for toml files" // {default = true;};
}; };
checks = { checks = {
@@ -205,22 +179,20 @@
# 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} = craneLib.buildPackage ({ ${cfg.package.name} =
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'
treefmt.programs = lib.mkIf cfg.formatter.enable { treefmt = lib.mkIf cfg.formatter.enable {
alejandra.enable = lib.mkIf cfg.formatter.nix true; programs.alejandra.enable = lib.mkIf cfg.formatter.nix true;
rustfmt = lib.mkIf cfg.formatter.rust { programs.rustfmt = lib.mkIf cfg.formatter.rust {
enable = true; enable = true;
edition = manifest.edition; edition = manifest.edition;
}; };
taplo.enable = lib.mkIf cfg.formatter.toml true;
rumdl-check.enable = lib.mkIf cfg.formatter.markdown true;
rumdl-format.enable = lib.mkIf cfg.formatter.markdown true;
}; };
checks = lib.mkIf cfg.checks.enable { checks = lib.mkIf cfg.checks.enable {
rust/template/.rumdl.toml
-8
View File
@@ -1,8 +0,0 @@
[global]
disable = [
# line length limits
"MD013",
]
[MD057]
absolute-links = "relative_to_roots"
rust/template/Cargo.toml
+1
View File
@@ -15,3 +15,4 @@ tracing-subscriber = "*"
clap = { version = "*", features = ["derive"] } clap = { version = "*", features = ["derive"] }
figment = { version = "*", features = ["toml", "env", "json"] } figment = { version = "*", features = ["toml", "env", "json"] }