Updated some plugins

lua/plugins/wichkey.lua

@@ -1,14 +1,17 @@
 return {
-  "folke/which-key.nvim",
-  event = "VeryLazy",
-  init = function()
-    vim.o.timeout = true
-    vim.o.timeoutlen = 300
-  end,
-  opts = {
-
-    -- your configuration comes here
-    -- or leave it empty to use the default settings
-    -- refer to the configuration section below
-  }
+	"folke/which-key.nvim",
+	event = "VeryLazy",
+	init = function()
+		vim.o.timeout = true
+		vim.o.timeoutlen = 300
+		local wk = require("which-key")
+		wk.add({
+			{ "<leader>sa", name  "[S]urround [A]dd" },
+		})
+	end,
+	opts = {
+		-- your configuration comes here
+		-- or leave it empty to use the default settings
+		-- refer to the configuration section below
+	},
 }

lua/stevenmm/lazy/cmp.lua

@@ -14,6 +14,9 @@ return {
 		"onsails/lspkind.nvim",
 	},
 
+	event = {
+		"InsertEnter", "CmdlineEnter"
+	},
 	-- opts = function(_, opts)
 	-- 	opts.sources = vim.tbl_filter(function(source)
 	-- 		return not vim.tbl_contains({ "buffer", "nvim_lsp" }, source.name)
@@ -59,9 +62,15 @@ return {
 			},
 
 			-- preselect = { cmp.PreselectMode.Item },
-			performance = {
-				max_view_entries = 10,
-			},
+			-- performance = {
+			-- 	async_budget = 0,
+			-- 	confirm_resolve_timeout = 0,
+			-- 	debounce = 0,
+			-- 	fetching_timeout = 0,
+			-- 	filtering_context_budget = 0,
+			-- 	throttle = 0,
+			-- 	max_view_entries = 10,
+			-- },
 			snippet = {
 				expand = function(args)
 					require("luasnip").lsp_expand(args.body) -- For `luasnip` users.
@@ -99,6 +108,10 @@ return {
 				{ name = "luasnip" },
 			}, {
 				{ name = "buffer" },
+			}, {
+				{
+					name = "async_path",
+				},
 			}),
 		})
 	end,

lua/stevenmm/lazy/formatting.lua

@@ -17,7 +17,7 @@ return {
 						"css",
 						"html",
 						"json",
-					},
+				},
 				}),
 
 				null_ls.builtins.formatting.stylua.with({
@@ -28,6 +28,7 @@ return {
 					space_after_function_names = "Always",
 					collapse_simple_statement = "FunctionOnly",
 				}),
+				null_ls.builtins.formatting.shellharden.with({})
 
 				-- require("none-ls.diagnostics.eslint"),
 			},

lua/stevenmm/lazy/haproxy.lua

@@ -0,0 +1,6 @@
+return {
+  "Joorem/vim-haproxy",
+  config = function ()
+
+  end
+}

lua/stevenmm/lazy/jenkinsfile_linter.lua

@@ -0,0 +1,7 @@
+return {
+	"ckipp01/nvim-jenkinsfile-linter",
+
+	dependencies = {
+		"nvim-lua/plenary.nvim",
+	}
+}

lua/stevenmm/lazy/lsp.lua

@@ -7,6 +7,7 @@ return {
 		-- mason configs:
 		"williamboman/mason.nvim",
 		"williamboman/mason-lspconfig.nvim",
+		"Joorem/vim-haproxy",
 
 		"folke/lazydev.nvim",
 
@@ -21,17 +22,21 @@ return {
 		"L3MON4D3/LuaSnip",
 		"saadparwaiz1/cmp_luasnip",
 
-		"nvim-svelte/nvim-svelte-snippets",
+		-- "nvim-svelte/nvim-svelte-snippets",
 
 		-- fidget config:
 		"j-hui/fidget.nvim",
+
+		-- Jenkinsfile Linter
+		"ckipp01/nvim-jenkinsfile-linter"
 	},
 
 	config = function()
 		-- print("lsp.lua")
-    local lspconfig = require("lspconfig")
+		local lspconfig = require("lspconfig")
 		require("fidget").setup({})
 
+		lspconfig.gopls.setup({})
 		lspconfig.lua_ls.setup({
 			settings = {
 				Lua = {

lua/stevenmm/lazy/mason.lua

@@ -19,8 +19,8 @@ return {
 		require("mason").setup({})
 		require("mason-lspconfig").setup({
 			ensure_installed = {
-				"ts_ls",
-				"gopls",
+				-- "ts_ls",
+				-- "gopls",
 				"clangd",
 				"rust_analyzer",
 				-- "lua_ls",

lua/stevenmm/lazy/mini-icons.lua

@@ -0,0 +1,7 @@
+return {
+	"nvim-mini/mini.icons",
+	version = false,
+	config = function ()
+		require("mini.icons").setup()
+	end
+}

lua/stevenmm/lazy/minisurround.lua

@@ -2,6 +2,13 @@ return {
   "echasnovski/mini.surround",
   version = false,
   config = function()
-    require("mini.surround").setup()
+		local minis = require("mini.surround").setup()
+		local wk = require('which-key')
+		wk.add({
+			s = {
+				name = "Mini Surround",
+				a = { "<leader>sa", name = "[S]urround [A]dd" },
+			},
+		})
   end,
 }

lua/stevenmm/lazy/wichkey.lua

@@ -1,14 +1,26 @@
 return {
-  "folke/which-key.nvim",
-  event = "VeryLazy",
-  init = function()
-    vim.o.timeout = true
-    vim.o.timeoutlen = 300
-  end,
-  opts = {
-
-    -- your configuration comes here
-    -- or leave it empty to use the default settings
-    -- refer to the configuration section below
-  }
+	"folke/which-key.nvim",
+	event = "VeryLazy",
+	init = function()
+		vim.o.timeout = true
+		vim.o.timeoutlen = 300
+	end,
+	opts = {
+		-- your configuration comes here
+		-- or leave it empty to use the default settings
+		-- refer to the configuration section below
+		spec = {
+			{ "<leader>sa", name = "[S]urround [A]dd" },
+		}
+	},
+	config = function(_, opts)
+		local wk = require('which-key')
+		wk.setup(opts)
+		-- wk.add({
+		-- 	s = {
+		-- 		name = "Mini Surround",
+		-- 		a = { "<leader>sa", name = "[S]urround [A]dd" },
+		-- 	},
+		-- })
+	end
 }

lua/stevenmm/set.lua

@@ -1,3 +1,10 @@
+print(vim.loop.os_uname().sysname)
+
+-- if vim.fn.has("win32") then
+-- 	-- or vim.fn.has("win64") then
+-- 	print("windows")
+-- end
+
 -- vim.opt.guicursor = "n-v-c:block,i-ci-ve:ver25,r-cr:hor20,o:hor50/,a:blinkwait700-blinkoff400-blinkon250-Cursor/lCursor/,sm:block-blinkwait175-blinkoff150-blinkon175"
 
 vim.opt.number = true
@@ -12,16 +19,16 @@ vim.opt.inccommand = "split"
 vim.opt.splitright = true
 -- vim.opt.splitbelow = true
 
--- vim.opt.tabstop = 4
--- vim.opt.softtabstop = 4
--- vim.opt.shiftwidth = 4
+vim.opt.tabstop = 4
+vim.opt.softtabstop = 4
+vim.opt.shiftwidth = 4
 
-vim.opt.tabstop = 2
-vim.opt.softtabstop = 2
-vim.opt.shiftwidth = 2
+-- vim.opt.tabstop = 2
+-- vim.opt.softtabstop = 2
+-- vim.opt.shiftwidth = 2
 
 vim.opt.smarttab = false
-vim.opt.expandtab = true
+-- vim.opt.expandtab = true
 
 vim.opt.smartindent = false
 
@@ -35,11 +42,12 @@ vim.opt.colorcolumn = "80"
 vim.opt.swapfile = false
 vim.opt.backup = false
 
-if vim.fn.has("win32") or vim.fn.has("win64") then
-	vim.opt.undodir = os.getenv("XDG_CONFIG_HOME") .. "/.vim/undodir"
+vim.opt.undodir = os.getenv("XDG_CONFIG_HOME") .. "/.vim/undodir"
+
+if vim.loop.os_uname().sysname  == "Windows" then
 	vim.opt.shell = "powershell.exe"
 else
-	vim.opt.undodir = os.getenv("HOME") .. "/.vim/undodir"
+	-- vim.opt.undodir = os.getenv("HOME") .. "/.vim/undodir"
 	vim.opt.shell = "bash"
 end