From 62415d9fa269049d879267035b0b898097479b04 Mon Sep 17 00:00:00 2001
From: Benjamin Palko <Benjaminpalko@hotmail.com>
Date: Sun, 18 Aug 2024 11:57:11 -0400
Subject: [PATCH] lazyvim + glsl

---
 home-manager/nvim.nix       |  1 +
 nvim/lazy-lock.json         |  9 +++++----
 nvim/lazyvim.json           |  1 +
 nvim/lua/plugins/meson.lua  | 16 +++++++++++-----
 nvim/lua/plugins/opengl.lua | 16 ++++++++++++++++
 5 files changed, 34 insertions(+), 9 deletions(-)
 create mode 100644 nvim/lua/plugins/opengl.lua

diff --git a/home-manager/nvim.nix b/home-manager/nvim.nix
index 73f9830..1d3e47a 100644
--- a/home-manager/nvim.nix
+++ b/home-manager/nvim.nix
@@ -19,6 +19,7 @@
     clang
     clang-tools
     # OpenGL
+    glslls
     fmt
     fmt.dev
     glfw-wayland
diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json
index 2d9df14..6a358fe 100644
--- a/nvim/lazy-lock.json
+++ b/nvim/lazy-lock.json
@@ -13,7 +13,7 @@
   "flash.nvim": { "branch": "main", "commit": "ec0bf2842189f65f60fd40bf3557cac1029cc932" },
   "flit.nvim": { "branch": "main", "commit": "1ef72de6a02458d31b10039372c8a15ab8989e0d" },
   "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" },
-  "fzf-lua": { "branch": "main", "commit": "40904abf2bdd784aa789515ce3cd0bc267e5eff4" },
+  "fzf-lua": { "branch": "main", "commit": "0d1b399bc5de04a6c0b41d6b1032c65566dbc609" },
   "gitsigns.nvim": { "branch": "main", "commit": "375c44bdfdde25585466a966f00c2e291db74f2d" },
   "grug-far.nvim": { "branch": "main", "commit": "536b23dcf3165a622654544e5f9f395584e73b57" },
   "gruvbox.nvim": { "branch": "main", "commit": "7a1b23e4edf73a39642e77508ee6b9cbb8c60f9e" },
@@ -25,7 +25,7 @@
   "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
   "luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" },
   "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
-  "markdown.nvim": { "branch": "main", "commit": "7986be47531d652e950776536987e01dd5b55b94" },
+  "markdown.nvim": { "branch": "main", "commit": "4c823b1df151dbf1ed3ddaacac517be606b1e145" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "1c55991321d1a861537e32446affc5de5d9a6eaf" },
   "mason-nvim-dap.nvim": { "branch": "main", "commit": "8b9363d83b5d779813cdd2819b8308651cec2a09" },
   "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
@@ -46,7 +46,7 @@
   "none-ls.nvim": { "branch": "main", "commit": "cfa65d86e21eeb60544d5e823f6db43941322a53" },
   "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" },
   "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" },
-  "nvim-dap": { "branch": "master", "commit": "2b428ff2632e73295e9decbcf1c40d8e26213305" },
+  "nvim-dap": { "branch": "master", "commit": "281a2e4cd1e7a17cea7ecb1745d84a8ab1249925" },
   "nvim-dap-go": { "branch": "main", "commit": "5511788255c92bdd845f8d9690f88e2e0f0ff9f2" },
   "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" },
   "nvim-dap-virtual-text": { "branch": "master", "commit": "484995d573c0f0563f6a66ebdd6c67b649489615" },
@@ -55,7 +55,8 @@
   "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
   "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" },
   "nvim-snippets": { "branch": "main", "commit": "56b4052f71220144689caaa2e5b66222ba5661eb" },
-  "nvim-treesitter": { "branch": "master", "commit": "6d74da7f0a29c35ee7636e157e72dd221e8d6197" },
+  "nvim-treesitter": { "branch": "master", "commit": "ec8776ed9ef56ffe7a61e67b64d5d6b6aba2c631" },
+  "nvim-treesitter-context": { "branch": "master", "commit": "0f3332788e0bd37716fbd25f39120dcfd557c90f" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "ced6375723b20616282f9f6a1018a63ae19b106a" },
   "nvim-ts-autotag": { "branch": "main", "commit": "0cb76eea80e9c73b88880f0ca78fbd04c5bdcac7" },
   "nvim-ts-context-commentstring": { "branch": "main", "commit": "375c2d86cee6674afd75b4f727ce3a80065552f7" },
diff --git a/nvim/lazyvim.json b/nvim/lazyvim.json
index b0a8f65..06f7484 100644
--- a/nvim/lazyvim.json
+++ b/nvim/lazyvim.json
@@ -31,6 +31,7 @@
     "lazyvim.plugins.extras.test.core",
     "lazyvim.plugins.extras.ui.mini-animate",
     "lazyvim.plugins.extras.ui.mini-indentscope",
+    "lazyvim.plugins.extras.ui.treesitter-context",
     "lazyvim.plugins.extras.util.dot",
     "lazyvim.plugins.extras.util.mini-hipatterns"
   ],
diff --git a/nvim/lua/plugins/meson.lua b/nvim/lua/plugins/meson.lua
index eae5fdf..b283411 100644
--- a/nvim/lua/plugins/meson.lua
+++ b/nvim/lua/plugins/meson.lua
@@ -1,9 +1,15 @@
 return {
-  "neovim/nvim-lspconfig",
-  opts = {
-    servers = {
-      mesonlsp = {
-        mason = false,
+  {
+    "nvim-treesitter/nvim-treesitter",
+    opts = { ensure_installed = { "meson" } },
+  },
+  {
+    "neovim/nvim-lspconfig",
+    opts = {
+      servers = {
+        mesonlsp = {
+          mason = false,
+        },
       },
     },
   },
diff --git a/nvim/lua/plugins/opengl.lua b/nvim/lua/plugins/opengl.lua
new file mode 100644
index 0000000..aecc544
--- /dev/null
+++ b/nvim/lua/plugins/opengl.lua
@@ -0,0 +1,16 @@
+return {
+  {
+    "nvim-treesitter/nvim-treesitter",
+    opts = { ensure_installed = { "glsl" } },
+  },
+  {
+    "neovim/nvim-lspconfig",
+    opts = {
+      servers = {
+        glslls = {
+          mason = false,
+        },
+      },
+    },
+  },
+}