diff --git a/.direnv/flake-profile b/.direnv/flake-profile index 0c05709..40be88b 120000 --- a/.direnv/flake-profile +++ b/.direnv/flake-profile @@ -1 +1 @@ -flake-profile-1-link \ No newline at end of file +flake-profile-5-link \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 4f5fccc..b3ecfd9 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,5 @@ { - "nixEnvSelector.nixFile": "${workspaceFolder}/shell.nix", + "nixEnvSelector.nixFile": "${workspaceFolder}/flake.nix", "cSpell.words": [ "evtbuzz" ], diff --git a/clover-hub/src/main.rs b/clover-hub/src/main.rs index 5593374..7e4e973 100644 --- a/clover-hub/src/main.rs +++ b/clover-hub/src/main.rs @@ -147,8 +147,8 @@ fn get_signal_handle( async fn wait_for_signal_impl(server_token: Option) { use log::debug; use tokio::signal::unix::{ - SignalKind, signal, + SignalKind, }; // Infos here: diff --git a/clover-hub/src/server/appd/docker.rs b/clover-hub/src/server/appd/docker.rs index 793ac8a..06d6f6f 100644 --- a/clover-hub/src/server/appd/docker.rs +++ b/clover-hub/src/server/appd/docker.rs @@ -1,7 +1,7 @@ use crate::server::appd::models::Application; use bollard::{ - Docker, image::BuildImageOptions, + Docker, }; use futures::TryStreamExt; use log::{ diff --git a/clover-hub/src/server/modman/ipc/gestures.rs b/clover-hub/src/server/modman/ipc/gestures.rs index 1d8cf05..ceb7cc1 100644 --- a/clover-hub/src/server/modman/ipc/gestures.rs +++ b/clover-hub/src/server/modman/ipc/gestures.rs @@ -5,17 +5,15 @@ Default area specification - com.reboot-codes.clover.CORE.human - torso - core - - tail-bone - back - spine + - upper/middle/bottom - front - - spine - chest - font - - sternum - - right-pectoral - - left-pectoral + - right/center/left - back + - right/center/left - arms - right/left - shoulder @@ -41,13 +39,17 @@ Default area specification - upper/lower - eyebrow - ears + right/left - top - back - pelivs - waist + - left/right/upper/lower - front + - upper/lower - bottom - rear + - right/left - legs - right/left - thigh diff --git a/clover-hub/src/server/modman/mod.rs b/clover-hub/src/server/modman/mod.rs index b364909..5f7cba9 100644 --- a/clover-hub/src/server/modman/mod.rs +++ b/clover-hub/src/server/modman/mod.rs @@ -9,10 +9,7 @@ use log::{ debug, info, }; -use models::{ - ModManStore, - Module, -}; +use models::ModManStore; use modules::{ deinit_module, init_module, diff --git a/clover-hub/src/tui/mod.rs b/clover-hub/src/tui/mod.rs index 0d84358..d2239a6 100644 --- a/clover-hub/src/tui/mod.rs +++ b/clover-hub/src/tui/mod.rs @@ -5,10 +5,10 @@ use crossterm::{ }, execute, terminal::{ - EnterAlternateScreen, - LeaveAlternateScreen, disable_raw_mode, enable_raw_mode, + EnterAlternateScreen, + LeaveAlternateScreen, }, }; use log::info; @@ -19,7 +19,6 @@ use std::{ }; use tokio_util::sync::CancellationToken; use tui::{ - Terminal, backend::CrosstermBackend, layout::{ Constraint, @@ -39,6 +38,7 @@ use tui::{ Borders, Paragraph, }, + Terminal, }; pub async fn tui_main( diff --git a/flake.lock b/flake.lock index 26811af..8f936b4 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1741513245, - "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", + "lastModified": 1746141548, + "narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", + "rev": "f02fddb8acef29a8b32f10a335d44828d7825b78", "type": "github" }, "original": { @@ -36,11 +36,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1736320768, - "narHash": "sha256-nIYdTAiKIGnFNugbomgBJR+Xv5F1ZQU+HfaBqJKroC0=", + "lastModified": 1744536153, + "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4bc9c909d9ac828a039f288cf872d16d38185db8", + "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", "type": "github" }, "original": { @@ -62,11 +62,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1741660300, - "narHash": "sha256-0jldJ58sC5RjqwpwE+ER+RPMeX4Moz5im/evQ3SU/dU=", + "lastModified": 1746239644, + "narHash": "sha256-wMvMBMlpS1H8CQdSSgpLeoCWS67ciEkN/GVCcwk7Apc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ac2f556db0eb5cbba3c4f5f5989c46330f439b0b", + "rev": "bd32e88bef6da0e021a42fb4120a8df2150e9b8c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 57e235b..7c8152a 100644 --- a/flake.nix +++ b/flake.nix @@ -13,6 +13,7 @@ overlays = [ (import rust-overlay) ]; pkgs = import nixpkgs { inherit system overlays; + config.allowUnfree = true; }; in { @@ -31,6 +32,8 @@ kdePackages.qtbase nodejs_23 yarn-berry + trunk-io + rust-analyzer ]; shellHook = '' @@ -41,7 +44,9 @@ pkgs.vulkan-loader pkgs.libxkbcommon ] - }"''; + }" + RUST_SRC_PATH = "${pkgs.rust-bin.nightly.latest.default}/lib/rustlib/src/rust/library"; + ''; }; } );