.config/nvim/lua/plugins/completions.lua

@@ -1,15 +1,15 @@
 return {
---	{
+	{
---		"L3MON4D3/LuaSnip",
+		"L3MON4D3/LuaSnip",
---		dependencies = {
+		dependencies = {
---			"saadparwaiz1/cmp_luasnip", -- Snippets source for nvim-cmp
+			"saadparwaiz1/cmp_luasnip", -- Snippets source for nvim-cmp
---			"rafamadriz/friendly-snippets", -- Collection of snippets
+			"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" }, -- Show suggestions from LSP
+					--{ name = "nvim_lsp" },
 					{ name = "luasnip" }, -- For luasnip users.
 				}, {
 					{ name = "buffer" },

.config/nvim/lua/plugins/debugging.lua

@@ -69,11 +69,7 @@ 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 = {
@@ -84,13 +80,10 @@ return {
 					command = "fdfind -p '.*/bin/python$' ~/Code/.venvs",
 				},
 			},
-			options = {
+      post_set_venv = function()
-				on_venv_activate_callback = function()
+        local venv_path = require("venv-selector").get_active_path()
-          local python_path = require("venv-selector").python()
+        vim.env.PYTHONPATH = venv_path .. "/lib/python3.*/site-packages"
-					--print("Active python: " .. python_path)
+      end
-					vim.env.PYTHONPATH = python_path
-				end,
-			},
 		},
 	},
 }

.config/nvim/lua/plugins/language-server.lua

@@ -6,20 +6,6 @@ return {
       require("mason").setup({})
     end,
   },
-	{
-		"WhoIsSethDaniel/mason-tool-installer.nvim",
-		config = function()
-			require("mason-tool-installer").setup({
-				ensure_installed = {
-					"stylua",
-					"mdformat",
-					"hadolint",
-					"yamllint",
-					"gh-actions-language-server",
-				},
-			})
-		end,
-	},
   {
     "mason-org/mason-lspconfig.nvim",
     tag = "v1.32.0",
@@ -28,10 +14,13 @@ return {
         ensure_installed = {
           "lua_ls",
           "bashls",
-					--"helm_ls",
+          "dockerls",
+          --"gh-actions-language-server",
+          "helm_ls",
           "jsonls",
+          "marksman",
           "nginx_language_server",
-					"basedpyright",
+          "pyright",
           "ruff",
           "yamlls",
         },
@@ -46,10 +35,6 @@ return {
         sources = {
           null_ls.builtins.formatting.stylua,
           null_ls.builtins.formatting.mdformat,
-					null_ls.builtins.diagnostics.hadolint,
-					null_ls.builtins.diagnostics.yamllint.with({
-						extra_args = { "-d", "rules:\n  document-start: disable" },
-					}),
         },
       })
       vim.keymap.set("n", "<leader>af", vim.lsp.buf.format, { desc = "Auto-Format File" })
@@ -63,7 +48,6 @@ return {
     dependencies = {
       "mason-org/mason.nvim",
       "mason-org/mason-lspconfig.nvim",
-      "WhoIsSethDaniel/mason-tool-installer.nvim",
     },
     config = function()
       local capabilities = require("cmp_nvim_lsp").default_capabilities()
@@ -72,36 +56,15 @@ return {
         capabilities = capabilities,
       })
       lspconfig.lua_ls.setup({ capabilities = capabilities })
-			lspconfig.bashls.setup({
+      lspconfig.bashls.setup({ capabilities = capabilities })
-				capabilities = capabilities,
+      lspconfig.dockerls.setup({ capabilities = capabilities })
-				cmd = { "bash-language-server", "start" },
+      lspconfig.helm_ls.setup({ capabilities = capabilities })
-				filetypes = { "sh", "bash" },
-			})
-			lspconfig.gh_actions_ls.setup({ capabilities = capabilities })
-			--	lspconfig.helm_ls.setup({ capabilities = capabilities })
       lspconfig.jsonls.setup({ capabilities = capabilities })
-			lspconfig.basedpyright.setup({
-				capabilities = capabilities,
-				settings = {
-					basedpyright = {
-						analysis = {
-							typeCheckingMode = "off",
-							diagnosticSeverityOverrides = {
-								reportUnusedImport = false,
-								reportUnusedVariable = false,
-							},
-						},
-					},
-				},
-			})
       lspconfig.nginx_language_server.setup({ capabilities = capabilities })
+      lspconfig.marksman.setup({ capabilities = capabilities })
+      lspconfig.pyright.setup({ capabilities = capabilities })
       lspconfig.ruff.setup({
         capabilities = capabilities,
-				init_options = {
-					settings = {
-						lineLength = 79,
-					},
-				},
       })
       lspconfig.yamlls.setup({ capabilities = capabilities })
       vim.keymap.set("n", "<leader>vd", vim.lsp.buf.hover, { desc = "View Docstring" })

.config/nvim/lua/plugins/syntax_highlighting.lua

@@ -12,7 +12,6 @@ return {
 					"query",
 					"markdown",
 					"markdown_inline",
-          "bash",
 					"json",
 					"jsonc",
 					"python",

.zshrc

@@ -9,6 +9,8 @@ bindkey -v
 
 # Configure cursor
 function zle-keymap-select {
+    #RPS1="${${KEYMAP/vicmd/-- NORMAL --}/(main|viins)/-- INSERT --}"
+    #RPS2=$RPS1
     zle reset-prompt
 
   case $KEYMAP in
@@ -98,7 +100,6 @@ alias ll='ls -alFh'
 alias ls="ls --color=auto"
 alias lsl="ls --color=auto -lah"
 alias ssh=ssh
-
 # Use tmux for local unelevated shells
 if [ -z "${SUDO_USER}" ] && [ -z "${SSH_CONNECTION}" ] && [ -z "${TERM_PROGRAM}" ]; then
   tmux new -A -s local_tmux
@@ -150,7 +151,10 @@ zinit light zsh-users/zsh-autosuggestions
 zinit light zsh-users/zsh-syntax-highlighting
 
 # Key bindings config
-#KEYTIMEOUT=5
+KEYTIMEOUT=5
 # ^[ for esc; ^I for tab
 bindkey '^[[Z' autosuggest-accept
 
+## Explicitly exit ok
+#echo "" > /dev/null
+