Compare commits

...

20 Commits

Author SHA1 Message Date
reed 60448993c5 refactor(rust): update the way the rust.srcToolchain default works and also some defaultText 2026-06-10 23:51:54 -05:00
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
reed d40b80a910 feat: add toml and markdown formatters 2026-06-07 21:49:51 -05:00
reed 7a05bf3d5e feat(rust): add toml and markdown formatters 2026-06-07 21:38:44 -05:00
reed 81008113e3 feat(rust-esp32-c6): disable checks because they don't work with std 2026-06-04 21:28:57 -05:00
reed bc7f84a854 feat(rust): add the krantz.rust.cargoArtifacts.extraAttrs option 2026-06-04 21:28:32 -05:00
reed c95a397e58 fix(rust): fix krantz.rust.package.extraAttrs option 2026-06-04 21:28:06 -05:00
reed e6289d758b feat(rust-esp32-c6): make the rust-esp32-c6 template 2026-06-04 20:25:26 -05:00
reed d00885ced7 feat(rust): add to .gitignore 2026-06-04 20:18:34 -05:00
reed 0c581ed8b0 fix: don't error if src and srcToolchain is not defined. Just default to nixpkgs toolchain instead. 2026-06-01 16:11:50 -05:00
reed 3fefb3570a feat: add support for custom rust toolchains compatible with rustup 2026-05-31 20:16:39 -05:00
reed 30264efdb4 chore: sign commits from gitea actions 2026-05-07 22:05:23 -05:00
reed f62e56552b chore!: use https urls for private flake inputs 2026-05-07 15:16:31 -05:00
github-actions[bot] dcbc45ff0a flake.lock: Update
Flake lock file updates:

• Updated input 'crane':
    'github:ipetkov/crane/60c829383710f7e26454e6677c4d3adbc56dd3b8?narHash=sha256-WMC5ktOHtCyJL/jtlf46P%2BI4Vhw938%2BoLlSpM8gwQwU%3D' (2026-04-25)
  → 'github:ipetkov/crane/5e0fb2f64edff2822249f21293b8304dedaaf676?narHash=sha256-bEg5xoAxAwsyfnGhkEX7RJViTIBIYPd8ISg4O1c0HFc%3D' (2026-04-28)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/0726a0ecb6d4e08f6adced58726b95db924cef57?narHash=sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI%3D' (2026-04-22)
  → 'github:nixos/nixpkgs/1c3fe55ad329cbcb28471bb30f05c9827f724c76?narHash=sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M%2BC8yzzIRYbE%3D' (2026-04-27)
2026-05-01 00:02:04 +00:00
reed 72c39db45c feat: add enable options for formatters and checks
Flake.lock: update Nix dependencies for development environment only / nix-flake-update (push) Successful in 1m54s
2026-04-28 18:52:59 -05:00
reed b4f51b4209 fix: fix the error about options not set when disabling the devShell or package options for templates 2026-04-28 18:31:06 -05:00
reed bc9f888bcf fix: fix warning about x86_64-darwin being depreciated 2026-04-28 17:12:39 -05:00
reed df51d2ffc8 fix: fix the flake producing errors on check and when trying to access the templates output 2026-04-28 17:11:37 -05:00
reed 5683d7e84c feat!(cad): rename build123d template to cad 2026-04-28 13:04:50 -05:00
28 changed files with 605 additions and 93 deletions
+5 -2
View File
@@ -14,8 +14,11 @@ jobs:
- name: "install nix"
uses: cachix/install-nix-action@v31
- name: "setup git user"
uses: fregante/setup-git-user@v2
- uses: photostructure/git-ssh-signing-action@v1
with:
ssh-signing-key: ${{ secrets.SSH_SIGNING_KEY }}
git-user-name: ${{ vars.GIT_USER_NAME }}
git-user-email: ${{ vars.GIT_USER_EMAIL }}
- name: "update flake.lock"
run: |
+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
Nix flake templates for initializing new projects.
Nix flake templates for initializing new projects.
+55 -43
View File
@@ -5,13 +5,13 @@
}: {
flake = {
templates = {
build123d = {
cad = {
path = ./template;
description = "A python flake with a build132d/cadquery parametric cad setup";
};
};
flakeModules.build123d = {
flakeModules.cad = {
imports = [
inputs.treefmt-nix.flakeModule
];
@@ -23,7 +23,7 @@
system,
...
}: let
cfg = config.krantz.build123d;
cfg = config.krantz.cad;
cq = inputs.cadquery.packages.${system};
@@ -39,7 +39,7 @@
"3mf"
];
in {
options.krantz.build123d = {
options.krantz.cad = {
enable = lib.mkEnableOption "executing a python build123d/cadquery file to generate 3d files";
builder = lib.mkOption {
@@ -65,13 +65,13 @@
};
devShell = {
enable = lib.mkEnableOption "a build123d development environment" // {default = true;};
enable = lib.mkEnableOption "a build123d/cadquery development environment" // {default = true;};
name = lib.mkOption {
description = "The name of the attribute in devShells to configure";
type = lib.types.str;
default = "default";
example = "build123d";
example = "cad";
};
extraAttrs = lib.mkOption {
@@ -96,56 +96,68 @@
example = "3dfiles";
};
};
formatter = {
enable = lib.mkEnableOption "treefmt for formatting multiple types of files" // {default = true;};
nix = lib.mkEnableOption "formatting for nix files" // {default = true;};
};
};
config = lib.mkIf cfg.enable {
# Dev Shell that lets you enter an environment with all the necessary utilites
# Available through 'nix develop'
# Also can be activated automatically if direnv is installed on the system with 'direnv allow'
devShells.${cfg.devShell.name} = lib.mkIf cfg.devShell.enable (pkgs.mkShell {
packages = [
pyEnv
];
devShells = lib.mkIf cfg.devShell.enable {
${cfg.devShell.name} =
pkgs.mkShell {
packages = [
pyEnv
];
shellHook = ''
export PYTHONPATH="${pyEnv}/${pyEnv.sitePackages}:$PYTHONPATH"
'';
}
// cfg.devShell.extraAttrs);
# Formatter for nix files, available through 'nix fmt'
treefmt = {
programs.alejandra.enable = lib.mkDefault true;
shellHook = ''
export PYTHONPATH="${pyEnv}/${pyEnv.sitePackages}:$PYTHONPATH"
'';
}
// cfg.devShell.extraAttrs;
};
# Your custom packages
# Accessible through 'nix build', 'nix shell', 'nix run', etc
packages.${cfg.package.name} = lib.mkIf cfg.package.enable (pkgs.runCommand cfg.outputName {}
/*
bash
*/
''
mkdir $out
cd $out
packages = lib.mkIf cfg.package.enable {
${cfg.package.name} =
pkgs.runCommand cfg.outputName {}
/*
bash
*/
''
mkdir $out
cd $out
${pyEnv}/bin/python ${cfg.builder}
${pyEnv}/bin/python ${cfg.builder}
${
if cfg.outputName != ""
then
/*
bash
*/
''
for ext in ${lib.concatStringsSep " " outputExt}; do
if [[ -f output.$ext ]]; then
mv output.$ext ${cfg.outputName}.$ext
fi
done
''
else ""
}
'');
${
if cfg.outputName != ""
then
/*
bash
*/
''
for ext in ${lib.concatStringsSep " " outputExt}; do
if [[ -f output.$ext ]]; then
mv output.$ext ${cfg.outputName}.$ext
fi
done
''
else ""
}
'';
};
# Formatter for nix files, available through 'nix fmt'
treefmt.programs = lib.mkIf cfg.formatter.enable {
alejandra.enable = lib.mkIf cfg.formatter.nix true;
};
};
});
};
@@ -1,5 +1,5 @@
{
description = "made with build123d";
description = "made with build123d/cadquery";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
@@ -7,7 +7,7 @@
flake-parts.url = "github:hercules-ci/flake-parts";
project-templates = {
url = "git+ssh://gitea@git.krantz.one/reed/project-templates";
url = "git+https://git.krantz.one/reed/project-templates";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-parts.follows = "flake-parts";
};
@@ -20,15 +20,15 @@
} @ inputs:
flake-parts.lib.mkFlake {inherit inputs;} {
imports = [
project-templates.flakeModules.build123d
project-templates.flakeModules.cad
];
systems = ["aarch64-linux" "x86_64-linux" "aarch64-darwin"];
perSystem = {pkgs, ...}: {
krantz.build123d = {
krantz.cad = {
enable = true;
builder = ./build3d.py;
builder = ./build.py;
outputName = "box";
};
Generated
+27 -6
View File
@@ -95,11 +95,11 @@
},
"crane": {
"locked": {
"lastModified": 1777149905,
"narHash": "sha256-WMC5ktOHtCyJL/jtlf46P+I4Vhw938+oLlSpM8gwQwU=",
"lastModified": 1777335812,
"narHash": "sha256-bEg5xoAxAwsyfnGhkEX7RJViTIBIYPd8ISg4O1c0HFc=",
"owner": "ipetkov",
"repo": "crane",
"rev": "60c829383710f7e26454e6677c4d3adbc56dd3b8",
"rev": "5e0fb2f64edff2822249f21293b8304dedaaf676",
"type": "github"
},
"original": {
@@ -177,11 +177,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1776877367,
"narHash": "sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI=",
"lastModified": 1777268161,
"narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "0726a0ecb6d4e08f6adced58726b95db924cef57",
"rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76",
"type": "github"
},
"original": {
@@ -262,9 +262,30 @@
"crane": "crane",
"flake-parts": "flake-parts",
"nixpkgs": "nixpkgs_2",
"rust-overlay": "rust-overlay",
"treefmt-nix": "treefmt-nix"
}
},
"rust-overlay": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1780197589,
"narHash": "sha256-FVCr2Ij/jKf59a4LW481eeOF6rJRreOBrVgW/aUBTrw=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "21632e942d89bf1cce4e5a63d7e58a215a0cbfcc",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
+40 -6
View File
@@ -13,6 +13,11 @@
crane.url = "github:ipetkov/crane";
rust-overlay = {
url = "github:oxalica/rust-overlay";
inputs.nixpkgs.follows = "nixpkgs";
};
cadquery = {
url = "github:vinszent/cq-flake";
# unfortunately dependencies are out of date so this needs it's own nixpkgs
@@ -20,17 +25,46 @@
};
};
outputs = {flake-parts, ...} @ inputs:
outputs = {
self,
flake-parts,
...
} @ inputs:
flake-parts.lib.mkFlake {inherit inputs;} {
imports = [
flake-parts.flakeModules.flakeModules
./build123d
./cad
./rust
./rust-esp32-c6
inputs.treefmt-nix.flakeModule
flake-parts.flakeModules.flakeModules
# define the flake.templates option
({lib, ...}: {
options.flake.templates = lib.mkOption {
type = lib.types.lazyAttrsOf (lib.types.submodule {
options = {
path = lib.mkOption {type = lib.types.path;};
description = lib.mkOption {type = lib.types.str;};
};
});
default = {};
};
})
];
systems = ["aarch64-linux" "x86_64-linux" "aarch64-darwin" "x86_64-darwin"];
flake.flakeModule = {
imports = builtins.attrValues (builtins.removeAttrs self.flakeModules ["default"]);
};
perSystem = {pkgs, ...}: {formatter = pkgs.alejandra;};
systems = ["aarch64-linux" "x86_64-linux" "aarch64-darwin"];
perSystem = {pkgs, ...}: {
treefmt.programs = {
alejandra.enable = true; # nix
taplo.enable = true; # toml
rumdl-check.enable = true; # markdown
rumdl-format.enable = true; # markdown
};
};
};
}
+52
View File
@@ -0,0 +1,52 @@
{
flake-parts-lib,
inputs,
self,
...
}: {
flake = {
templates = {
rust-esp32-c6 = {
path = ./template;
description = "ESP32-C6 RISC-V rust project with a blink led example";
};
};
flakeModules.rust-esp32-c6 = {
imports = [
inputs.treefmt-nix.flakeModule
self.outputs.flakeModules.rust
];
options.perSystem = flake-parts-lib.mkPerSystemOption ({
lib,
config,
pkgs,
self',
...
}: let
cfg = config.krantz.rust.esp32-c6;
craneLib = config.krantz.rust.craneLib;
in {
options.krantz.rust.esp32-c6 = {
enable = lib.mkEnableOption "additional tooling for the esp32 RISC-V";
};
config = lib.mkIf cfg.enable {
krantz.rust.devDeps = lib.mkOptionDefault (with pkgs; [
espflash
]);
krantz.rust.cargoArtifacts.extraAttrs = lib.mkOptionDefault {
doCheck = false;
};
krantz.rust.package.extraAttrs = lib.mkOptionDefault {
doCheck = false;
};
};
});
};
};
}
+18
View File
@@ -0,0 +1,18 @@
[target.riscv32imac-unknown-none-elf]
runner = "espflash flash --monitor --chip esp32c6 --log-format defmt"
[env]
DEFMT_LOG = "info"
[build]
rustflags = [
# Required to obtain backtraces (e.g. when using the "esp-backtrace" crate.)
# NOTE: May negatively impact performance of produced code
"-C",
"force-frame-pointers",
]
target = "riscv32imac-unknown-none-elf"
[unstable]
build-std = ["alloc", "core"]
+1
View File
@@ -0,0 +1 @@
stack-size-threshold = 1024
+1
View File
@@ -0,0 +1 @@
use flake
@@ -0,0 +1,30 @@
name: "Flake.lock: update Nix dependencies for development environment only"
on:
workflow_dispatch: # allows manual triggering
schedule:
- cron: '00 00 02 1/2 *' # runs the first of day the month every 2 months at 7:00pm local time (midnight UTC)
jobs:
nix-flake-update:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: "install nix"
uses: cachix/install-nix-action@v31
- name: "setup git user"
uses: fregante/setup-git-user@v2
- name: "update flake.lock"
run: |
nix flake update --commit-lock-file
- name: "check flake for errors"
run: |
nix flake check
- name: "push update"
run: |
git push
+23
View File
@@ -0,0 +1,23 @@
# Generated by nix
.direnv/
result
# Generated by Cargo
# will have compiled files and executables
debug/
target/
# Editor configuration
.vscode/
.zed/
.helix/
.nvim.lua
# These are backup files generated by rustfmt
**/*.rs.bk
# MSVC Windows builds of rustc generate these, which store debugging information
*.pdb
# Ignore .DS_Store file in mac
**/.DS_Store
+8
View File
@@ -0,0 +1,8 @@
[global]
disable = [
# line length limits
"MD013",
]
[MD057]
absolute-links = "relative_to_roots"
+48
View File
@@ -0,0 +1,48 @@
[package]
edition = "2024"
name = "rust-esp32-c6"
rust-version = "1.88"
version = "0.1.0"
[[bin]]
name = "rust-esp32-c6"
path = "./src/bin/main.rs"
[dependencies]
esp-hal = { version = "~1.1.0", features = ["defmt", "esp32c6", "unstable"] }
esp-rtos = { version = "0.3.0", features = [
"defmt",
"embassy",
"esp-alloc",
"esp32c6",
] }
defmt = "1.0.1"
esp-bootloader-esp-idf = { version = "0.5.0", features = ["defmt", "esp32c6"] }
embassy-executor = { version = "0.10.0", features = ["defmt"] }
embassy-time = { version = "0.5.0", features = ["defmt"] }
esp-alloc = { version = "0.10.0", features = ["defmt"] }
esp-backtrace = { version = "0.19.0", features = [
"defmt",
"esp32c6",
"panic-handler",
] }
esp-println = { version = "0.17.0", features = ["defmt-espflash", "esp32c6"] }
critical-section = "1.2.0"
static_cell = "2.1.1"
# For fine tuning these settings, please refer to https://doc.rust-lang.org/cargo/reference/profiles.html
[profile.dev]
# The default debug profile is too slow and too big for resource-constrained devices.
# Always build with some optimizations enabled.
opt-level = "s"
[profile.release]
codegen-units = 1 # LLVM can perform better optimizations using a single thread
debug = 2 # prefer slower builds but better debugging experience
lto = 'fat'
opt-level = 's'
+71
View File
@@ -0,0 +1,71 @@
fn main() {
linker_be_nice();
println!("cargo:rustc-link-arg=-Tdefmt.x");
// make sure linkall.x is the last linker script (otherwise might cause problems with flip-link)
println!("cargo:rustc-link-arg=-Tlinkall.x");
}
fn linker_be_nice() {
let args: Vec<String> = std::env::args().collect();
if args.len() > 1 {
let kind = &args[1];
let what = &args[2];
match kind.as_str() {
"undefined-symbol" => match what.as_str() {
what if what.starts_with("_defmt_") => {
eprintln!();
eprintln!(
"💡 `defmt` not found - make sure `defmt.x` is added as a linker script and you have included `use defmt_rtt as _;`"
);
eprintln!();
}
"_stack_start" => {
eprintln!();
eprintln!("💡 Is the linker script `linkall.x` missing?");
eprintln!();
}
what if what.starts_with("esp_rtos_") => {
eprintln!();
eprintln!(
"💡 `esp-radio` has no scheduler enabled. Make sure you have initialized `esp-rtos` or provided an external scheduler."
);
eprintln!();
}
"embedded_test_linker_file_not_added_to_rustflags" => {
eprintln!();
eprintln!(
"💡 `embedded-test` not found - make sure `embedded-test.x` is added as a linker script for tests"
);
eprintln!();
}
"free"
| "malloc"
| "calloc"
| "get_free_internal_heap_size"
| "malloc_internal"
| "realloc_internal"
| "calloc_internal"
| "free_internal" => {
eprintln!();
eprintln!(
"💡 Did you forget the `esp-alloc` dependency or didn't enable the `compat` feature on it?"
);
eprintln!();
}
_ => (),
},
// we don't have anything helpful for "missing-lib" yet
_ => {
std::process::exit(1);
}
}
std::process::exit(0);
}
println!(
"cargo:rustc-link-arg=--error-handling-script={}",
std::env::current_exe().unwrap().display()
);
}
+42
View File
@@ -0,0 +1,42 @@
{
description = "esp32 tool";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
flake-parts.url = "github:hercules-ci/flake-parts";
project-templates = {
url = "git+https://git.krantz.one/reed/project-templates";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-parts.follows = "flake-parts";
};
};
outputs = {
flake-parts,
project-templates,
...
} @ inputs:
flake-parts.lib.mkFlake {inherit inputs;} {
imports = [
project-templates.flakeModules.rust-esp32-c6
];
systems = ["aarch64-linux" "x86_64-linux" "aarch64-darwin"];
perSystem = {pkgs, ...}: {
krantz.rust = {
esp32-c6 = {
enable = true;
};
enable = true;
src = ./.;
# runtimeDeps = with pkgs; [];
# buildDeps = with pkgs; [];
};
};
};
}
@@ -0,0 +1,4 @@
[toolchain]
channel = "stable"
components = ["rust-src"]
targets = ["riscv32imac-unknown-none-elf"]
+54
View File
@@ -0,0 +1,54 @@
#![no_std]
#![no_main]
#![deny(
clippy::mem_forget,
reason = "mem::forget is generally not safe to do with esp_hal types, especially those \
holding buffers for the duration of a data transfer."
)]
#![deny(clippy::large_stack_frames)]
use defmt::info;
use embassy_executor::Spawner;
use embassy_time::{Duration, Timer};
use esp_backtrace as _;
use esp_hal::clock::CpuClock;
use esp_hal::timer::timg::TimerGroup;
use esp_println as _;
extern crate alloc;
// This creates a default app-descriptor required by the esp-idf bootloader.
// For more information see: <https://docs.espressif.com/projects/esp-idf/en/stable/esp32/api-reference/system/app_image_format.html#application-description>
esp_bootloader_esp_idf::esp_app_desc!();
#[allow(
clippy::large_stack_frames,
reason = "it's not unusual to allocate larger buffers etc. in main"
)]
#[esp_rtos::main]
async fn main(spawner: Spawner) -> ! {
// generator version: 1.3.0
// generator parameters: --chip esp32c6 -o alloc -o unstable-hal -o esp-backtrace -o embassy -o defmt
let config = esp_hal::Config::default().with_cpu_clock(CpuClock::max());
let peripherals = esp_hal::init(config);
esp_alloc::heap_allocator!(#[esp_hal::ram(reclaimed)] size: 65536);
let timg0 = TimerGroup::new(peripherals.TIMG0);
let sw_interrupt =
esp_hal::interrupt::software::SoftwareInterruptControl::new(peripherals.SW_INTERRUPT);
esp_rtos::start(timg0.timer0, sw_interrupt.software_interrupt0);
info!("Embassy initialized!");
// TODO: Spawn some tasks
let _ = spawner;
loop {
info!("Hello world!");
Timer::after(Duration::from_secs(1)).await;
}
// for inspiration have a look at the examples at https://github.com/esp-rs/esp-hal/tree/esp-hal-v1.1.0/examples
}
+1
View File
@@ -0,0 +1 @@
#![no_std]
+90 -28
View File
@@ -25,10 +25,17 @@
}: let
cfg = config.krantz.rust;
craneLib = inputs.crane.mkLib pkgs;
src = cfg.srcFiltered;
manifest = (lib.importTOML "${src}/Cargo.toml").package;
craneLib =
if cfg.srcToolchain != null && builtins.pathExists cfg.srcToolchain
then
(inputs.crane.mkLib (pkgs.extend inputs.rust-overlay.overlays.default)).overrideToolchain (
p: p.rust-bin.fromRustupToolchainFile cfg.srcToolchain
)
else inputs.crane.mkLib pkgs;
buildInputs = cfg.runtimeDeps;
# build dependencies
@@ -36,25 +43,46 @@
# Build *just* the cargo dependencies, so we can reuse
# all of that work (e.g. via cachix) when running in CI
cargoArtifacts = craneLib.buildDepsOnly {
inherit src buildInputs nativeBuildInputs;
};
cargoArtifacts = craneLib.buildDepsOnly ({
inherit src buildInputs nativeBuildInputs;
}
// cfg.cargoArtifacts.extraAttrs);
in {
options.krantz.rust = {
enable = lib.mkEnableOption "building a cargo project with crane";
src = lib.mkOption {
description = "The path to the root of the crate.";
type = lib.types.path;
type = lib.types.nullOr lib.types.path;
default = null;
example = lib.literalExpression "./.";
};
srcFiltered = lib.mkOption {
description = "A path to the filtered directory of the root of the crate.";
type = lib.types.path;
default = craneLib.cleanCargoSource cfg.src;
defaultText = lib.literalExpression "config.krantz.rust.craneLib cfg.src";
defaultText = lib.literalExpression "config.krantz.rust.craneLib.cleanCargoSource cfg.src";
example = lib.literalExpression "./.";
};
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.nullOr lib.types.path;
default =
if cfg.src != null
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";
};
runtimeDeps = lib.mkOption {
description = "Packages needed for the app to run.";
@@ -81,6 +109,17 @@
];
};
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 = {
enable = lib.mkEnableOption "a rust development environment" // {default = true;};
@@ -123,6 +162,21 @@
};
};
formatter = {
enable = lib.mkEnableOption "treefmt for formatting multiple types of files" // {default = true;};
nix = lib.mkEnableOption "formatting for nix 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 = {
enable = lib.mkEnableOption "checks for rust" // {default = true;};
linter = lib.mkEnableOption "lints for rust" // {default = true;};
};
craneLib = lib.mkOption {
description = "The crane lib instance this module is using. Useful for overriding options";
default = craneLib;
@@ -135,37 +189,45 @@
# Dev Shell that lets you enter an environment with all the necessary utilites
# Available through 'nix develop'
# Also can be activated automatically if direnv is installed on the system with 'direnv allow'
devShells.${cfg.devShell.name} = lib.mkIf cfg.devShell.enable (craneLib.devShell {
inherit (self') checks;
devShells = lib.mkIf cfg.devShell.enable {
${cfg.devShell.name} =
craneLib.devShell {
inherit (self') checks;
# extra tooling dependencies
packages = cfg.devDeps;
# extra tooling dependencies
packages = cfg.devDeps;
inputsFrom = [self'.packages.${cfg.package.name}];
}
// cfg.devShell.extraAttrs);
# Formatter for nix files, available through 'nix fmt'
treefmt = {
programs.alejandra.enable = lib.mkDefault true;
programs.rustfmt = {
enable = true;
edition = manifest.edition;
};
inputsFrom = [self'.packages.${cfg.package.name}];
}
// cfg.devShell.extraAttrs;
};
# Your custom packages
# Accessible through 'nix build', 'nix shell', 'nix run', etc
packages.${cfg.package.name} = lib.mkIf cfg.package.enable (craneLib.buildPackage {
inherit src buildInputs nativeBuildInputs cargoArtifacts;
}
// cfg.package.extraAttrs);
packages = lib.mkIf cfg.package.enable {
${cfg.package.name} = craneLib.buildPackage ({
inherit src buildInputs nativeBuildInputs cargoArtifacts;
}
// cfg.package.extraAttrs);
};
checks = {
clippy = craneLib.cargoClippy {
# Formatter for nix files, available through 'nix fmt'
treefmt.programs = lib.mkIf cfg.formatter.enable {
alejandra.enable = lib.mkIf cfg.formatter.nix true;
rustfmt = lib.mkIf cfg.formatter.rust {
enable = true;
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 {
clippy = lib.mkIf cfg.checks.linter (craneLib.cargoClippy {
inherit src buildInputs nativeBuildInputs cargoArtifacts;
cargoClippyExtraArgs = "-- --deny warnings";
};
});
};
};
});
+12
View File
@@ -7,5 +7,17 @@ result
debug/
target/
# Editor configuration
.vscode/
.zed/
.helix/
.nvim.lua
# These are backup files generated by rustfmt
**/*.rs.bk
# MSVC Windows builds of rustc generate these, which store debugging information
*.pdb
# Ignore .DS_Store file in mac
**/.DS_Store
+8
View File
@@ -0,0 +1,8 @@
[global]
disable = [
# line length limits
"MD013",
]
[MD057]
absolute-links = "relative_to_roots"
-1
View File
@@ -15,4 +15,3 @@ tracing-subscriber = "*"
clap = { version = "*", features = ["derive"] }
figment = { version = "*", features = ["toml", "env", "json"] }
+1 -1
View File
@@ -7,7 +7,7 @@
flake-parts.url = "github:hercules-ci/flake-parts";
project-templates = {
url = "git+ssh://gitea@git.krantz.one/reed/project-templates";
url = "git+https://git.krantz.one/reed/project-templates";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-parts.follows = "flake-parts";
};