From 623e3790009532dcede69106eca555d9ac3b631b Mon Sep 17 00:00:00 2001 From: alsaiduq-lab Date: Mon, 30 Jun 2025 10:35:01 -0600 Subject: [PATCH] fixes rust --- modules/default.nix | 1 + modules/rust.nix | 35 ++++++++++++++--------------------- 2 files changed, 15 insertions(+), 21 deletions(-) diff --git a/modules/default.nix b/modules/default.nix index 97cb804..9404ed7 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -21,6 +21,7 @@ ./i3-xfce.nix ./ollama.nix ./cups.nix + ./rust.nix ]; npm.enable = true; diff --git a/modules/rust.nix b/modules/rust.nix index dc99574..47697e5 100644 --- a/modules/rust.nix +++ b/modules/rust.nix @@ -1,23 +1,16 @@ -{ - lib, - pkgs, - config, - ... -}: { - options.rust = { - enable = lib.mkEnableOption "System Rust Environment"; - }; - - config = lib.mkIf config.rust.enable { - environment.systemPackages = with pkgs; [ - rustup - rust-analyzer - clippy - cargo-edit - cargo-watch - cargo-outdated - cargo-audit - minijinja-cli - ]; +{pkgs, ...}: let + rustToolchain = pkgs.symlinkJoin { + name = "rust-toolchain"; + paths = with pkgs; [rustc cargo rustfmt clippy]; }; +in { + environment.systemPackages = with pkgs; [ + rustToolchain + rust-analyzer + cargo-edit + cargo-watch + cargo-outdated + cargo-audit + minijinja-cli + ]; }