rust lsp fix + languages on/off

2 files changed, 13 insertions, 18 deletions

diff --git a/nixos/languages/default.nix b/nixos/languages/default.nix
index 4f5cc75..b469aa4 100644
--- a/nixos/languages/default.nix
+++ b/nixos/languages/default.nix
@@ -1,15 +1,13 @@
-{ config, pkgs, ... }:
+{ config, pkgs, languages, ... }:
 {
   imports =
-    [
-      ./beam.nix
-      ./c.nix
-      ./asm.nix
-      ./go.nix
-      ./javascript.nix
-      ./lua.nix
-      ./python.nix
-      ./rust.nix
-      ./zig.nix
-    ];
+    (if languages.beam then [ ./beam.nix ] else []) ++
+    (if languages.c then [ ./c.nix ] else []) ++
+    (if languages.asm then [ ./asm.nix ] else []) ++
+    (if languages.go then [ ./go.nix ] else []) ++
+    (if languages.javascript then [ ./javascript.nix ] else []) ++
+    (if languages.lua then [ ./lua.nix ] else []) ++
+    (if languages.python then [ ./python.nix ] else []) ++
+    (if languages.rust then [ ./rust.nix ] else []) ++
+    (if languages.zig then [ ./zig.nix ] else []);
 }
diff --git a/nixos/opt/default.nix b/nixos/opt/default.nix
index c9b6892..58a6dcf 100644
--- a/nixos/opt/default.nix
+++ b/nixos/opt/default.nix
@@ -1,9 +1,6 @@
-{ nvidia, llm, ... }:
+{ opt, ... }:
 {
   imports =
-    (if nvidia then [
-      ./nvidia.nix
-    ] else []) ++ (if llm then [
-      ./llm.nix
-    ] else []);
+    (if opt.nvidia then [ ./nvidia.nix ] else []) ++
+    (if opt.llm then [ ./llm.nix ] else []);
 }