From f68b1bb276a178ac1b36747727a0bbddb8e8c83b Mon Sep 17 00:00:00 2001 From: Kerdonov Date: Thu, 20 Nov 2025 23:57:53 +0200 Subject: [PATCH] modified toolchain, added helix editor --- flake.nix | 19 ++++++++++--------- gravel_cli/src/main.rs | 1 - rust-toolchain.toml | 3 ++- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/flake.nix b/flake.nix index 63ace70..e4f522a 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { - description = "stdsrv Flake file"; + description = "gravel project flake"; inputs = { nixpkgs.url = "nixpkgs/nixos-unstable"; @@ -14,16 +14,17 @@ flake-utlis.lib.eachDefaultSystem ( system: let pkgs = import nixpkgs {inherit system;}; - stdsrv = import ./package.nix {inherit pkgs;}; + gravel = import ./package.nix {inherit pkgs;}; in { - packages.default = stdsrv; + packages.default = gravel; devShells.default = pkgs.mkShell { - packages = [ - pkgs.rustup - pkgs.bacon - pkgs.cargo-nextest - pkgs.cargo-expand - pkgs.cargo-watch + packages = with pkgs; [ + rustup + helix + bacon + cargo-nextest + cargo-expand + cargo-watch ]; }; } diff --git a/gravel_cli/src/main.rs b/gravel_cli/src/main.rs index c4e7c35..c027db3 100644 --- a/gravel_cli/src/main.rs +++ b/gravel_cli/src/main.rs @@ -3,7 +3,6 @@ use args::ProgramArgs; use cracked_md::generate; use error::Error; -//use slogger::{LOG_LEVEL, Level}; use stdsrv::serve; mod args; diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 9dd8a10..836548d 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -5,5 +5,6 @@ targets = [ ] components = [ "clippy", - "rustfmt" + "rustfmt", + "rust-analyzer" ]