diff --git a/home-manager/cobray.nix b/home-manager/cobray.nix
index 526bd8c..a4c2f2f 100644
--- a/home-manager/cobray.nix
+++ b/home-manager/cobray.nix
@@ -36,6 +36,5 @@
     btop
     nvtopPackages.full
     arandr
-    inputs.nix-gaming.packages.${pkgs.system}.wine-discord-ipc-bridge
   ];
 }
diff --git a/hosts/system-packages.nix b/hosts/system-packages.nix
index 8e0423f..4c3b2e8 100644
--- a/hosts/system-packages.nix
+++ b/hosts/system-packages.nix
@@ -8,12 +8,11 @@
     linuxHeaders
     appimage-run
     freetype.dev
-    zed-editor
     pixman
+    bitwarden
     udiskie
     maim
     mercurial
-    obsidian
     go
     go-tools
     gopls
@@ -40,6 +39,13 @@
     jdk17
     maven
     gradle
+    rustc
+    rustup
+    cargo-edit
+    cargo-watch
+    cargo-outdated
+    cargo-audit
+    rust-analyzer
     visualvm
     wget
     curl
diff --git a/modules/default.nix b/modules/default.nix
index 9d5d29d..97cb804 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -17,7 +17,6 @@
     ./tailscale.nix
     ./udiskie.nix
     ./ld.nix
-    ./rust.nix
     ./x11.nix
     ./i3-xfce.nix
     ./ollama.nix
diff --git a/modules/rust.nix b/modules/rust.nix
index af2c845..a10c5db 100644
--- a/modules/rust.nix
+++ b/modules/rust.nix
@@ -1,31 +1,21 @@
 {
-  config,
-  pkgs,
   lib,
+  pkgs,
+  config,
   ...
 }: {
-  options.rust = {
-    enable = lib.mkEnableOption "System Rust Environment";
-  };
+  options.rust.enable = lib.mkEnableOption "System Rust Environment";
 
   config = lib.mkIf config.rust.enable {
     environment.systemPackages = with pkgs; [
-      rustc
       rustup
+      rust-analyzer
+      clippy
       cargo-edit
       cargo-watch
       cargo-outdated
       cargo-audit
-      rust-analyzer
-      clippy
       minijinja-cli
     ];
-
-    environment.variables = {
-      PATH = [
-        "${pkgs.rustc}/bin"
-        "${pkgs.cargo}/bin"
-      ];
-    };
   };
 }