diff --git a/common/nvim/nvim.nix b/common/nvim/nvim.nix
index 1757e8c..134bad4 100644
--- a/common/nvim/nvim.nix
+++ b/common/nvim/nvim.nix
@@ -1,36 +1,58 @@
 { pkgs, lib, ... }:
 {
-  programs.neovim =
-    {
-      enable = true;
-      extraPackages = with pkgs; [
-        ripgrep
-        luarocks
-        gnumake
-        wget
-        nixpkgs-fmt
-        tree-sitter
+  options.modules.apps.neovim = {
+    enablelanguages = lib.mkEnableOption "enable LSP languages";
+  };
 
-        fd
+  imports = [
+    ./cpu.nix
+    ./vpn.nix
+    ./tray.nix
+    ./clock.nix
+    ./power.nix
+    ./memory.nix
+    ./window.nix
+    ./network.nix
+    ./workspaces.nix
+    ./temperature.nix
+    ./wireplumber.nix
+    ./spotify.nix
+    ../../common/colors.nix
+  ];
 
-        cargo
-        gcc
-        go
-        jdk22
-        lua51Packages.lua
-        nodejs
-        php83Packages.composer
-        php83
-        opam
-        (python3.withPackages (python-pkgs: [
-          python-pkgs.pip
-          python-pkgs.black
-        ]))
-      ];
-      defaultEditor = true;
-      viAlias = true;
-      vimAlias = true;
+  config = {
+    programs.neovim =
+      {
+        enable = true;
+        extraPackages = with pkgs; [
+          ripgrep
+          luarocks
+          gnumake
+          wget
+          nixpkgs-fmt
+          tree-sitter
+          fd
 
-      extraLuaConfig = lib.fileContents ./init.lua;
-    };
+          (lib.mkIf config.modules.neovim.enableLanguages cargo)
+          (lib.mkIf config.modules.neovim.enableLanguages gcc)
+          (lib.mkIf config.modules.neovim.enableLanguages go)
+          (lib.mkIf config.modules.neovim.enableLanguages jdk22)
+          (lib.mkIf config.modules.neovim.enableLanguages lua51Packages.lua)
+          (lib.mkIf config.modules.neovim.enableLanguages nodejs)
+          (lib.mkIf config.modules.neovim.enableLanguages php83Packages.composer)
+          (lib.mkIf config.modules.neovim.enableLanguages php83)
+          (lib.mkIf config.modules.neovim.enableLanguages opam)
+          (lib.mkIf config.modules.neovim.enableLanguages
+            (python3.withPackages (python-pkgs: [
+              python-pkgs.pip
+              python-pkgs.black
+            ])))
+        ];
+        defaultEditor = true;
+        viAlias = true;
+        vimAlias = true;
+
+        extraLuaConfig = lib.fileContents ./init.lua;
+      };
+  };
 }
diff --git a/hosts/lambdaos/home.nix b/hosts/lambdaos/home.nix
index 237678c..fbc51ec 100644
--- a/hosts/lambdaos/home.nix
+++ b/hosts/lambdaos/home.nix
@@ -61,6 +61,7 @@
       thunderbird = {
         enable = true;
       };
+      neovim.enablelanguages = true;
     };
   };
 
diff --git a/hosts/muos/home.nix b/hosts/muos/home.nix
index 4f6c9ae..9b19e4b 100644
--- a/hosts/muos/home.nix
+++ b/hosts/muos/home.nix
@@ -52,6 +52,7 @@
       thunderbird = {
         enable = true;
       };
+      neovim.enablelanguages = true;
     };
   };
 
diff --git a/hosts/nuos/home.nix b/hosts/nuos/home.nix
index 56f1eb3..d817505 100644
--- a/hosts/nuos/home.nix
+++ b/hosts/nuos/home.nix
@@ -50,6 +50,7 @@
       email = "noa@voorwaarts.nl";
     };
     apps.zsh.enable = true;
+    apps.neovim.enablelanguages = true;
   };
 
   services.syncthing = {