diff --git a/dev-flakes/vulkan/flake.lock b/dev-flakes/vulkan/flake.lock
new file mode 100644
index 0000000..3009a12
--- /dev/null
+++ b/dev-flakes/vulkan/flake.lock
@@ -0,0 +1,61 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1770841267,
+        "narHash": "sha256-9xejG0KoqsoKEGp2kVbXRlEYtFFcDTHjidiuX8hGO44=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "ec7c70d12ce2fc37cb92aff673dcdca89d187bae",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/dev-flakes/vulkan/flake.nix b/dev-flakes/vulkan/flake.nix
index 08a70ef..61a183f 100644
--- a/dev-flakes/vulkan/flake.nix
+++ b/dev-flakes/vulkan/flake.nix
@@ -21,16 +21,27 @@
           name = "vulkan";
 
           packages = with pkgs; [
-            shaderc
+            # Shader compile
+            shader-slang
+            glslang
+            # Vulkan
             vulkan-headers
             vulkan-loader
             vulkan-validation-layers
             vulkan-tools
-            glfw
+            vulkan-utility-libraries
+            # Other libraries
+            glfw3
+            tinyobjloader
+            glm
             cmake
+            ninja
           ];
-          VK_LAYER_PATH = "${pkgs.vulkan-loader}/lib:${pkgs.shaderc.lib}/lib"
-         
+          # Environment Variables
+          LD_LIBRARY_PATH = "${pkgs.vulkan-loader}/lib:${pkgs.shaderc.lib}/lib";
+          VK_LAYER_PATH = "${pkgs.vulkan-validation-layers}/share/vulkan/explicit_layer.d";
+          VULKAN_SDK = "${pkgs.vulkan-validation-layers}/share/vulkan/explicit_layer.d";
+
           shellHook = ''
             echo "Vulkan loaded"
           '';
diff --git a/modules/home-manager/nvim.nix b/modules/home-manager/nvim.nix
index 3e7d6af..4300742 100644
--- a/modules/home-manager/nvim.nix
+++ b/modules/home-manager/nvim.nix
@@ -132,6 +132,10 @@
             nixd = {
               enable = true;
             };
+
+            cmake-language-server = {
+              enable = true;
+            };
             
             # C++ language server
             clangd = {