Update and fix builds

.editorconfig

@@ -9,10 +9,13 @@ indent_style = space
 max_line_length = 120
 trim_trailing_whitespace = true
 
-[*.adoc]
+[*.{adoc,lock}]
 indent_size = unset
 
-[*.{adoc,envrc,nix,nu,yaml,yml}]
+[*.lock]
+indent_style = unset
+
+[*.{adoc,envrc,lock,nix,nu,yaml,yml}]
 max_line_length = off
 
 [{justfile,.justfile,*.just,*.rs}]

.envrc

@@ -3,4 +3,3 @@ if ! has nix_direnv_version || ! nix_direnv_version 3.0.6; then
 fi
 
 use flake
-

.github/workflows/treefmt.yaml

@@ -43,4 +43,4 @@ jobs:
         with:
           fail_on_error: true
           github_token: ${{ secrets.GH_TOKEN_FOR_UPDATES }}
-          tool_name: treefmt
+          tool_name: treefmt-nix

.justfile

@@ -24,7 +24,7 @@ build board="attiny85" profile="dev":
 alias fmt := format
 
 format:
-    treefmt
+    treefmt-nix
 
 alias f := run
 alias flash := run
@@ -78,8 +78,8 @@ update:
     nix run ".#update-nixos-release"
     nix flake update
     cd "{{ justfile_directory() }}/boards/attiny85"
-    cargo update
+    cargo update --verbose
     cd "{{ justfile_directory() }}/boards/pico"
-    cargo update
+    cargo update --verbose
     cd "{{ justfile_directory() }}/boards/qt-py-ch32v203"
-    cargo update
+    cargo update --verbose

.vscode/settings.json

@@ -15,6 +15,7 @@
     "CMSIS",
     "Datasheet",
     "Dclippy",
+    "deadnix",
     "devel",
     "dialout",
     "direnv",
@@ -24,6 +25,7 @@
     "ifdef",
     "ifndef",
     "ihex",
+    "jsonfmt",
     "justfile",
     "Libc",
     "libusbx",
@@ -32,7 +34,9 @@
     "Micropython",
     "mogrify",
     "MOSI",
+    "nixfmt",
     "nixos",
+    "nixpkgs",
     "Noctua",
     "nostd",
     "Nushell",
@@ -43,23 +47,31 @@
     "picoprobe",
     "Pinout",
     "Pinouts",
+    "pkgs",
+    "pname",
     "proto",
     "Protoboard",
     "rustc",
     "rustfmt",
     "rustup",
+    "statix",
+    "stdenv",
     "SWCLK",
     "SWDIO",
+    "taplo",
     "thumbv",
     "tinyusb",
     "tlsv",
+    "treefmt",
     "uaccess",
     "UART",
     "udev",
     "udisksctl",
     "usermod",
     "VBUS",
-    "wchisp"
+    "wchisp",
+    "webp",
+    "yamlfmt"
   ],
   "files.watcherExclude": {
     "**/.direnv/**": true,

boards/attiny85/.envrc

@@ -3,4 +3,3 @@ if ! has nix_direnv_version || ! nix_direnv_version 3.0.6; then
 fi
 
 use flake ../..#attiny85
-

boards/attiny85/.justfile

@@ -17,7 +17,6 @@ run profile="dev": (build profile)
 
 # alias p := package
 # alias pack := package
-
 # package:
 #     ^nix build ".#attiny85"
 
@@ -26,4 +25,4 @@ alias up := update
 
 update:
     nix flake update
-    cargo update
+    cargo update --verbose

boards/attiny85/Cargo.toml

@@ -7,15 +7,16 @@ homepage = "https://github.com/jwillikers/pwm-fan-controller"
 description = "A simple PWM fan controller for microcontrollers"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/jwillikers/pwm-fan-controller.git"
+# autobin = false
 
 [dependencies]
-embedded-hal = "1.0.0"
-nb = "1.1.0"
-panic-halt = "0.2.0"
-ufmt = "0.2.0"
+embedded-hal = "1.0"
+nb = "1.1"
+panic-halt = "1.0"
+ufmt = "0.2"
 
 #[dependencies.avr-device]
-#version = "0.4.0"
+#version = "0.6.0"
 #features = ["attiny85"]
 
 [dependencies.avr-hal-generic]

boards/attiny85/rust-toolchain.toml

@@ -1,5 +1,6 @@
 [toolchain]
-channel = "nightly-2024-03-22"
+# channel = "nightly-2024-03-22"
+channel = "nightly"
 components = ["llvm-tools-preview", "rust-src"]
 profile = "minimal"
 targets = ["avr-unknown-none-attiny85.json"]

boards/pico/.envrc

@@ -3,4 +3,3 @@ if ! has nix_direnv_version || ! nix_direnv_version 3.0.6; then
 fi
 
 use flake ../..#pico
-

boards/pico/.justfile

@@ -50,4 +50,4 @@ alias up := package
 
 update:
     nix flake update
-    cargo update
+    cargo update --verbose