From d037c58394d7415aad1cc22df33123a2c062e2cc Mon Sep 17 00:00:00 2001
From: servostar <sven.vogel123@web.de>
Date: Fri, 15 Dec 2023 20:53:37 +0100
Subject: [PATCH] added lsp to dev

---
 dev/default.nix         |  4 +---
 dev/language-server.nix | 10 ----------
 dev/lsp.nix             | 13 +++++++++++++
 settings.nix            | 10 ++++++++++
 4 files changed, 24 insertions(+), 13 deletions(-)
 delete mode 100644 dev/language-server.nix
 create mode 100644 dev/lsp.nix

diff --git a/dev/default.nix b/dev/default.nix
index f8d9057..86786fc 100644
--- a/dev/default.nix
+++ b/dev/default.nix
@@ -3,9 +3,7 @@ let
     settings = import ./../settings.nix;
 in
 {
-    imports = [
-        ./language-server.nix
-    ]
+    imports = lib.optionals settings.dev.lsp.enable [ ./lsp.nix ]
     ++ lib.optionals settings.virtualisation.docker-rootless.enable [ ./docker-rootless.nix ]
     ++ lib.optionals settings.virtualisation.qemu.enable [ ./qemu.nix ]
     ++ lib.optionals settings.dev.platformio [ ./platformio.nix ]
diff --git a/dev/language-server.nix b/dev/language-server.nix
deleted file mode 100644
index 04f39c8..0000000
--- a/dev/language-server.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ pkgs, config, ... }: {
-    # various language server used by IDEs and by my Neovim config
-    environment.systemPackages = with pkgs; [
-        shellcheck
-        lua-language-server
-        pyright
-        arduino-language-server
-        clang
-    ];
-}
diff --git a/dev/lsp.nix b/dev/lsp.nix
new file mode 100644
index 0000000..27f3e5c
--- /dev/null
+++ b/dev/lsp.nix
@@ -0,0 +1,13 @@
+{ pkgs, lib, ... }:
+let
+    settings = import ./../settings.nix;
+in
+{
+    # various language server used by IDEs and by Neovim lsp-config
+    environment.systemPackages = with pkgs;
+        lib.optionals settings.dev.lsp.shellcheck [ shellcheck ]
+        ++ lib.optionals settings.dev.lsp.luals [ lua-language-server ]
+        ++ lib.optionals settings.dev.lsp.pyright[ pyright ]
+        ++ lib.optionals settings.dev.lsp.arduino [ arduino-language-server ]
+        ++ lib.optionals settings.dev.lsp.clangd [ clang ];
+}
diff --git a/settings.nix b/settings.nix
index 0c22b12..335eb6b 100644
--- a/settings.nix
+++ b/settings.nix
@@ -28,6 +28,16 @@ with import <nixpkgs> {}; {
         platformio = true;
         latex = true;
         dotnet = false;
+
+        lsp = {
+            enable = true;
+            # various language server
+            shellcheck = true;
+            luals = true;
+            pyright = true;
+            arduino = true;
+            clangd = true;
+        };
     };
 
     dvd = true;     # enable DVD decryption + ripping via Handbrake