From 33588e1afcfff9b1ea81501ff2bf2563ef41deab Mon Sep 17 00:00:00 2001
From: Daniel McKnight <daniel@mcknight.tech>
Date: Sun, 8 Jun 2025 22:46:02 -0700
Subject: [PATCH] Apply lua linter formatting Remove snippets Update python
 path on venv selection Use basedpyright language server for better import
 resolution

---
 .config/nvim/lua/plugins/completions.lua       | 18 +++++++++---------
 .config/nvim/lua/plugins/debugging.lua         | 17 ++++++++++++-----
 .config/nvim/lua/plugins/language-server.lua   |  4 ++--
 .../nvim/lua/plugins/syntax_highlighting.lua   |  1 +
 4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/.config/nvim/lua/plugins/completions.lua b/.config/nvim/lua/plugins/completions.lua
index 2770861..615a8f5 100644
--- a/.config/nvim/lua/plugins/completions.lua
+++ b/.config/nvim/lua/plugins/completions.lua
@@ -1,15 +1,15 @@
 return {
-	{
-		"L3MON4D3/LuaSnip",
-		dependencies = {
-			"saadparwaiz1/cmp_luasnip", -- Snippets source for nvim-cmp
-			"rafamadriz/friendly-snippets", -- Collection of snippets
-		},
-	},
+--	{
+--		"L3MON4D3/LuaSnip",
+--		dependencies = {
+--			"saadparwaiz1/cmp_luasnip", -- Snippets source for nvim-cmp
+--			"rafamadriz/friendly-snippets", -- Collection of snippets
+--		},
+--	},
 	{
 		"hrsh7th/nvim-cmp",
 		config = function()
-			require("luasnip.loaders.from_vscode").lazy_load() -- Load snippets from friendly-snippets
+--			require("luasnip.loaders.from_vscode").lazy_load() -- Load snippets from friendly-snippets
 			local cmp = require("cmp")
 
 			cmp.setup({
@@ -31,7 +31,7 @@ return {
 					["<CR>"] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
 				}),
 				sources = cmp.config.sources({
-					--{ name = "nvim_lsp" },
+					{ name = "nvim_lsp" }, -- Show suggestions from LSP
 					{ name = "luasnip" }, -- For luasnip users.
 				}, {
 					{ name = "buffer" },
diff --git a/.config/nvim/lua/plugins/debugging.lua b/.config/nvim/lua/plugins/debugging.lua
index 2df6154..5b1431e 100644
--- a/.config/nvim/lua/plugins/debugging.lua
+++ b/.config/nvim/lua/plugins/debugging.lua
@@ -69,7 +69,11 @@ return {
 		},
 		keys = {
 			{ "<Leader>ea", "<cmd>VenvSelect<cr>", desc = "Activate Virtual Environment" },
-			{ "<Leader>es", "<cmd>lua print(require('venv-selector').venv())<cr>", desc = "Show Active Virtual Environment" },
+			{
+				"<Leader>es",
+				"<cmd>lua print(require('venv-selector').venv())<cr>",
+				desc = "Show Active Virtual Environment",
+			},
 		},
 		opts = {
 			search = {
@@ -80,10 +84,13 @@ return {
 					command = "fdfind -p '.*/bin/python$' ~/Code/.venvs",
 				},
 			},
-      post_set_venv = function()
-        local venv_path = require("venv-selector").get_active_path()
-        vim.env.PYTHONPATH = venv_path .. "/lib/python3.*/site-packages"
-      end
+			options = {
+				on_venv_activate_callback = function()
+          local python_path = require("venv-selector").python()
+					--print("Active python: " .. python_path)
+					vim.env.PYTHONPATH = python_path
+				end,
+			},
 		},
 	},
 }
diff --git a/.config/nvim/lua/plugins/language-server.lua b/.config/nvim/lua/plugins/language-server.lua
index 45eb12e..a697ef2 100644
--- a/.config/nvim/lua/plugins/language-server.lua
+++ b/.config/nvim/lua/plugins/language-server.lua
@@ -20,7 +20,7 @@ return {
           "jsonls",
           "marksman",
           "nginx_language_server",
-          "pyright",
+          "basedpyright",
           "ruff",
           "yamlls",
         },
@@ -62,7 +62,7 @@ return {
       lspconfig.jsonls.setup({ capabilities = capabilities })
       lspconfig.nginx_language_server.setup({ capabilities = capabilities })
       lspconfig.marksman.setup({ capabilities = capabilities })
-      lspconfig.pyright.setup({ capabilities = capabilities })
+      lspconfig.basedpyright.setup({ capabilities = capabilities })
       lspconfig.ruff.setup({
         capabilities = capabilities,
       })
diff --git a/.config/nvim/lua/plugins/syntax_highlighting.lua b/.config/nvim/lua/plugins/syntax_highlighting.lua
index ac07741..f16b556 100644
--- a/.config/nvim/lua/plugins/syntax_highlighting.lua
+++ b/.config/nvim/lua/plugins/syntax_highlighting.lua
@@ -12,6 +12,7 @@ return {
 					"query",
 					"markdown",
 					"markdown_inline",
+          "bash",
 					"json",
 					"jsonc",
 					"python",