Compare commits

...

2 Commits

Author SHA1 Message Date
Reed Krantz
35e34c27f7 feat(flake): add treefmt for formatting all files 2026-02-18 18:14:12 -06:00
Reed Krantz
6be48da010 fix(flake): add the templates build dependency fix to this project 2026-02-18 17:49:27 -06:00
8 changed files with 76 additions and 39 deletions

View File

@@ -2,7 +2,7 @@
name = "squad-quote-store" name = "squad-quote-store"
version = "0.1.0" version = "0.1.0"
authors = ["Reed Krantz <programming@krantz.one>"] authors = ["Reed Krantz <programming@krantz.one>"]
edition = "2021" edition = "2024"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

23
flake.lock generated
View File

@@ -69,7 +69,8 @@
"crane": "crane", "crane": "crane",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay",
"treefmt-nix": "treefmt-nix"
} }
}, },
"rust-overlay": { "rust-overlay": {
@@ -91,6 +92,26 @@
"repo": "rust-overlay", "repo": "rust-overlay",
"type": "github" "type": "github"
} }
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1770228511,
"narHash": "sha256-wQ6NJSuFqAEmIg2VMnLdCnUc0b7vslUohqqGGD+Fyxk=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "337a4fe074be1042a35086f15481d763b8ddc0e7",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

View File

@@ -6,6 +6,11 @@
flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.url = "github:hercules-ci/flake-parts";
treefmt-nix = {
url = "github:numtide/treefmt-nix";
inputs.nixpkgs.follows = "nixpkgs";
};
crane.url = "github:ipetkov/crane"; crane.url = "github:ipetkov/crane";
rust-overlay = { rust-overlay = {
@@ -17,15 +22,30 @@
outputs = { outputs = {
nixpkgs, nixpkgs,
flake-parts, flake-parts,
treefmt-nix,
crane, crane,
rust-overlay, rust-overlay,
... ...
} @ inputs: } @ inputs:
flake-parts.lib.mkFlake {inherit inputs;} { flake-parts.lib.mkFlake {inherit inputs;} {
imports = [
treefmt-nix.flakeModule
];
systems = ["aarch64-linux" "x86_64-linux" "aarch64-darwin" "x86_64-darwin"]; systems = ["aarch64-linux" "x86_64-linux" "aarch64-darwin" "x86_64-darwin"];
perSystem = {system, ...}: let perSystem = {system, ...}: let
src = ./.; src = craneLib.cleanCargoSource ./.;
# runtime dependencies
buildInputs = with pkgs; [
# openssl
];
# build dependencies
nativeBuildInputs = with pkgs; [
# pkg-config
];
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
@@ -42,42 +62,14 @@
# 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; inherit src buildInputs nativeBuildInputs;
}; };
in rec { in rec {
# Formatter for nix files, available through 'nix fmt'
formatter = pkgs.alejandra;
# Your custom packages
# Accessible through 'nix build', 'nix shell', 'nix run', etc
packages = {
default = craneLib.buildPackage {
inherit src cargoArtifacts;
# runtime dependencies
# buildInputs = [];
# build dependencies
# nativeBuildInputs = [pkgs.pkg-config];
};
};
checks = {
clippy = craneLib.cargoClippy {
inherit src cargoArtifacts;
cargoClippyExtraArgs = "-- --deny warnings";
};
fmt = craneLib.cargoFmt {
inherit src cargoArtifacts;
};
};
# Dev Shell that lets you enter an environment with all the necessary utilites # Dev Shell that lets you enter an environment with all the necessary utilites
# Available through 'nix develop' # Available through 'nix develop'
# Also can be activated automatically if direnv is installed on the system with 'direnv allow' # Also can be activated automatically if direnv is installed on the system with 'direnv allow'
devShells.default = craneLib.devShell { devShells.default = craneLib.devShell {
inherit cargoArtifacts checks; inherit checks;
# extra tooling dependencies # extra tooling dependencies
packages = with pkgs; [ packages = with pkgs; [
@@ -87,6 +79,30 @@
inputsFrom = [packages.default]; inputsFrom = [packages.default];
}; };
# Formatter for nix files, available through 'nix fmt'
treefmt = {
programs.alejandra.enable = true;
programs.rustfmt = {
enable = true;
edition = (builtins.fromTOML (builtins.readFile "${src}/Cargo.toml")).package.edition;
};
};
# Your custom packages
# Accessible through 'nix build', 'nix shell', 'nix run', etc
packages = {
default = craneLib.buildPackage {
inherit src buildInputs nativeBuildInputs cargoArtifacts;
};
};
checks = {
clippy = craneLib.cargoClippy {
inherit src buildInputs nativeBuildInputs cargoArtifacts;
cargoClippyExtraArgs = "-- --deny warnings";
};
};
}; };
}; };
} }

View File

@@ -1,9 +1,9 @@
use dioxus::prelude::*; use dioxus::prelude::*;
use dioxus_primitives::{ use dioxus_primitives::{
ContentAlign,
date_picker::{self, DatePickerInputProps, DatePickerProps, DateRangePickerProps}, date_picker::{self, DatePickerInputProps, DatePickerProps, DateRangePickerProps},
popover::{PopoverContentProps, PopoverTriggerProps}, popover::{PopoverContentProps, PopoverTriggerProps},
ContentAlign,
}; };
use super::super::calendar::*; use super::super::calendar::*;

View File

@@ -1,11 +1,11 @@
use crate::components::{ use crate::components::{
Input,
date_picker::{DatePicker, DatePickerInput}, date_picker::{DatePicker, DatePickerInput},
textarea::Textarea, textarea::Textarea,
Input,
}; };
use dioxus::prelude::*; use dioxus::prelude::*;
use time::{macros::offset, OffsetDateTime}; use time::{OffsetDateTime, macros::offset};
#[component] #[component]
pub fn EditQuote() -> Element { pub fn EditQuote() -> Element {