Updated some plugins

lazy-lock.json

@@ -1,46 +1,49 @@
 {
-  "LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" },
+  "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" },
   "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
   "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" },
   "cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" },
   "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
-  "colorful-winsep.nvim": { "branch": "alpha", "commit": "0070484536ea55ec64a8453d41e3badace04a61a" },
+  "colorful-winsep.nvim": { "branch": "alpha", "commit": "7bbe4e1353c0fe37c98bad2758aafc410280f6b3" },
   "emoji.nvim": { "branch": "main", "commit": "5c68359b56d2470583832b6b2b559566c5b39dc8" },
   "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" },
-  "fzf-lua": { "branch": "main", "commit": "6488ada2f376e47789391dc353b6d91a3f9de6f6" },
-  "gitsigns.nvim": { "branch": "main", "commit": "3c76f7fabac723aa682365ef782f88a83ccdb4ac" },
+  "fzf-lua": { "branch": "main", "commit": "b45881a2043d96506ba628f3bc65a4594b179c4e" },
+  "gitsigns.nvim": { "branch": "main", "commit": "43b0c856ae5f32a195d83f4a27fe21d63e6c966c" },
   "harpoon": { "branch": "harpoon2", "commit": "ed1f853847ffd04b2b61c314865665e1dadf22c7" },
+  "hererocks": { "branch": "master", "commit": "c9c5444dea1e07e005484014a8231aa667be30b6" },
   "jest.nvim": { "branch": "master", "commit": "1ec13b863512f3673116986e6d27dc49bc17b829" },
   "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
   "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
   "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" },
-  "lualine.nvim": { "branch": "master", "commit": "1517caa8fff05e4b4999857319d3b0609a7f57fa" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
+  "lualine.nvim": { "branch": "master", "commit": "15884cee63a8c205334ab13ab1c891cd4d27101a" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "d39a75bbce4b8aad5d627191ea915179c77c100f" },
   "mason-null-ls.nvim": { "branch": "main", "commit": "de19726de7260c68d94691afb057fa73d3cc53e7" },
-  "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
+  "mason.nvim": { "branch": "main", "commit": "7c7318e8bae7e3536ef6b9e86b9e38e74f2e125e" },
   "mini.comment": { "branch": "main", "commit": "fb867a9246f9b892cf51a8c84a3f8479cdf1558c" },
+  "mini.icons": { "branch": "main", "commit": "ff2e4f1d29f659cc2bad0f9256f2f6195c6b2428" },
   "mini.indentscope": { "branch": "main", "commit": "8af2569a7d7fd37300dfa760e44e71efbbf322fd" },
   "mini.move": { "branch": "main", "commit": "4fe4a855fee53c66b0f3255a4b54ddc2ae6b308c" },
   "mini.pairs": { "branch": "main", "commit": "69864a2efb36c030877421634487fd90db1e4298" },
   "mini.surround": { "branch": "main", "commit": "5aab42fcdcf31fa010f012771eda5631c077840a" },
-  "none-ls.nvim": { "branch": "main", "commit": "a117163db44c256d53c3be8717f3e1a2a28e6299" },
-  "nvim-autopairs": { "branch": "master", "commit": "84a81a7d1f28b381b32acf1e8fe5ff5bef4f7968" },
-  "nvim-cmp": { "branch": "main", "commit": "059e89495b3ec09395262f16b1ad441a38081d04" },
-  "nvim-lspconfig": { "branch": "master", "commit": "40f120c10ea4b87311175539a183c3b75eab95a3" },
-  "nvim-svelte-snippets": { "branch": "main", "commit": "1afae9e05c8488d4cc956c0ddaf127844816ce5f" },
-  "nvim-tree.lua": { "branch": "master", "commit": "44d9b58f11d5a426c297aafd0be1c9d45617a849" },
-  "nvim-treesitter": { "branch": "master", "commit": "30654ee72a69e7c76a54b66d748dae088429e863" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "9937e5e356e5b227ec56d83d0a9d0a0f6bc9cad4" },
+  "none-ls.nvim": { "branch": "main", "commit": "7c493a266a6b1ed419f8a2e431651bc15b10df27" },
+  "nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" },
+  "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
+  "nvim-jenkinsfile-linter": { "branch": "main", "commit": "4bd761597348df2700dc456d870a1a5501448df2" },
+  "nvim-lspconfig": { "branch": "master", "commit": "61e5109c8cf24807e4ae29813a3a82b31821dd45" },
+  "nvim-tree.lua": { "branch": "master", "commit": "e7d1b7dadc62fe2eccc17d814354b0a5688621ce" },
+  "nvim-treesitter": { "branch": "master", "commit": "28d480e0624b259095e56f353ec911f9f2a0f404" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "0e3be38005e9673d044e994b1e4b123adb040179" },
   "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" },
   "nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" },
-  "nvim-web-devicons": { "branch": "master", "commit": "4c3a5848ee0b09ecdea73adcd2a689190aeb728c" },
+  "nvim-web-devicons": { "branch": "master", "commit": "f1420728f59843eb2ef084406b3d0201a0a0932d" },
   "plenary": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
   "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
   "telescope-file-browser.nvim": { "branch": "master", "commit": "626998e5c1b71c130d8bc6cf7abb6709b98287bb" },
   "telescope.nvim": { "branch": "master", "commit": "a4ed82509cecc56df1c7138920a1aeaf246c0ac5" },
   "vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" },
-  "vscode": { "branch": "main", "commit": "49d6014ba151fc6cc585b8d5f057ca7839077bf8" },
+  "vim-haproxy": { "branch": "master", "commit": "1d93a843b4c567c2f499ba0c7ed60c435109ee53" },
+  "vscode": { "branch": "main", "commit": "5769f298af4abf371528b25623fecb1e069c858c" },
   "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" },
   "winbar.nvim": { "branch": "main", "commit": "13739fdb31be51a1000486189662596f07a59a31" }
 }

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