diff --git a/modules/buildtools.nix b/modules/buildtools.nix
index c73337c..da1bd30 100644
--- a/modules/buildtools.nix
+++ b/modules/buildtools.nix
@@ -26,16 +26,11 @@ in {
           gnumake
           gcc
           gdb
-          llvmPackages.llvm
-          llvmPackages.clangUseLLVM
         ];
       })
     (lib.mkIf cfg.dotnet {
       environment = {
         systemPackages = with pkgs; [
-          unstable.jetbrains.jdk
-          unstable.jetbrains.rider
-
           dotnetPackage
 
           zlib
@@ -64,6 +59,14 @@ in {
         dotnetPackage
       ];
     })
+    (lib.mkIf (cfg.dotnet || config.my.desktop.enable) {
+      environment = {
+        systemPackages = with pkgs; [
+          unstable.jetbrains.jdk
+          unstable.jetbrains.rider
+        ];
+      };
+    })
     (lib.mkIf cfg.rust {
       environment.systemPackages = with pkgs; [
         cargo