diff --git a/ftdetect/wgsl.lua b/ftdetect/wgsl.lua
new file mode 100644
index 0000000..e4fd50b
--- /dev/null
+++ b/ftdetect/wgsl.lua
@@ -0,0 +1 @@
+vim.filetype.add({ extension = { wgsl = "wgsl" } })
diff --git a/ftplugin/wgsl.lua b/ftplugin/wgsl.lua
new file mode 100644
index 0000000..56ce0bf
--- /dev/null
+++ b/ftplugin/wgsl.lua
@@ -0,0 +1 @@
+vim.bo.commentstring = "// %s"
diff --git a/init.lua b/init.lua
index 3931db7..b225b3f 100644
--- a/init.lua
+++ b/init.lua
@@ -20,6 +20,7 @@ vim.lsp.enable({
   "volar",
   "tailwindcss",
   "cssls",
+  "wgsl_analyzer",
 })
 
 vim.api.nvim_create_autocmd("LspAttach", {
diff --git a/lsp/wgsl_analyzer.lua b/lsp/wgsl_analyzer.lua
new file mode 100644
index 0000000..6253673
--- /dev/null
+++ b/lsp/wgsl_analyzer.lua
@@ -0,0 +1,4 @@
+return {
+  cmd = { "wgsl-analyzer" },
+  filetypes = { "wgsl" },
+}
diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua
index 3125feb..7d2253d 100644
--- a/lua/plugins/treesitter.lua
+++ b/lua/plugins/treesitter.lua
@@ -33,6 +33,7 @@ return {
       'vue',
       'java',
       'angular',
+      'wgsl',
     }
 
     for _, parser in ipairs(parsers) do