From c3d41436a1af4e45a8e93f719edc75f80aa5c173 Mon Sep 17 00:00:00 2001 From: S4NKALP Date: Sat, 24 Aug 2024 21:45:09 +0545 Subject: [PATCH] wip --- lua/configs/none-ls.lua | 2 ++ lua/lock.json | 19 +++++++++---------- lua/plugins/other.lua | 1 + mason-lock.json | 12 ++---------- 4 files changed, 14 insertions(+), 20 deletions(-) diff --git a/lua/configs/none-ls.lua b/lua/configs/none-ls.lua index 5477207..8b0efaa 100644 --- a/lua/configs/none-ls.lua +++ b/lua/configs/none-ls.lua @@ -12,6 +12,7 @@ mason_null_ls.setup({ "stylua", -- lua formatter "black", -- python formatter "pylint", -- python linter + "google-java-format", -- java formatter -- "eslint_d", -- js linter }, }) @@ -32,6 +33,7 @@ null_ls.setup({ formatting.isort, formatting.black, formatting.clang_format, + formatting.google_java_format, diagnostics.pylint, -- diagnostics.eslint_d.with({ -- js/ts linter -- condition = function(utils) diff --git a/lua/lock.json b/lua/lock.json index 815a83c..8fe65f9 100644 --- a/lua/lock.json +++ b/lua/lock.json @@ -10,7 +10,7 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "code_runner.nvim": { "branch": "main", "commit": "6c5bfe44a6c7523350cd706e6b3b8101166eed99" }, - "codeium.vim": { "branch": "main", "commit": "0b74f274b82c00eaad4b5b5cd8b2e76f872d19f1" }, + "codeium.vim": { "branch": "main", "commit": "8bed5fb5708c94cd69f418d1381d6fbf07cb0313" }, "comment-box.nvim": { "branch": "main", "commit": "06bb771690bc9df0763d14769b779062d8f12bc5" }, "dashboard-nvim": { "branch": "master", "commit": "fabf5feec96185817c732d47d363f34034212685" }, "dotfyle-metadata.nvim": { "branch": "main", "commit": "342ef8f3f98f3ccc451c9cf2be74e95149ced05d" }, @@ -28,14 +28,13 @@ "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-lock.nvim": { "branch": "main", "commit": "86614f76c3442fba1c5c8d79aa1efcb3ad69de1c" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "1c55991321d1a861537e32446affc5de5d9a6eaf" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "482350b050bd413931c2cdd4857443c3da7d57cb" }, "mason-null-ls.nvim": { "branch": "main", "commit": "de19726de7260c68d94691afb057fa73d3cc53e7" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "mini.files": { "branch": "main", "commit": "9de79b28e5b7a9dc92b9ae2ba21296f7075b51a7" }, + "mini.files": { "branch": "main", "commit": "7ed15315247775b4c5fcfaf4c8fe45d3a0dde9ad" }, "mini.icons": { "branch": "main", "commit": "12e7b5d47bfc1b4c5ba4278fb49ec9100138df14" }, - "mini.nvim": { "branch": "main", "commit": "71b5694a2df4f7e3661855eb8e2814980d2e0ac9" }, - "mini.pick": { "branch": "main", "commit": "27fc7862b7a1fc2e04356dc5ed1caf7049baccb4" }, + "mini.nvim": { "branch": "main", "commit": "3cf9265bbde75d1358d126701eb6055034491df6" }, "modes.nvim": { "branch": "main", "commit": "3188692abf02a8838ec75e59d68c2ce3e4323f5c" }, "neo-tree.nvim": { "branch": "main", "commit": "206241e451c12f78969ff5ae53af45616ffc9b72" }, "neotest": { "branch": "master", "commit": "32ff2ac21135a372a42b38ae131e531e64833bd3" }, @@ -44,19 +43,19 @@ "neotest-rspec": { "branch": "main", "commit": "53fc108a06ae43d7f873d42ee5189c2301e33623" }, "nerdy.nvim": { "branch": "main", "commit": "b467d6609b78d6a5f1e12cbc08fcc1ac87af20f5" }, "noice.nvim": { "branch": "main", "commit": "448bb9c524a7601035449210838e374a30153172" }, - "none-ls.nvim": { "branch": "main", "commit": "cfa65d86e21eeb60544d5e823f6db43941322a53" }, + "none-ls.nvim": { "branch": "main", "commit": "3cc6c6ae11c89a6963f0b5a25ad2ce211039faf2" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, "numb.nvim": { "branch": "master", "commit": "3f7d4a74bd456e747a1278ea1672b26116e0824d" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, "nvim-dap": { "branch": "master", "commit": "281a2e4cd1e7a17cea7ecb1745d84a8ab1249925" }, "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "92a673de7ecaa157dd230d0128def10beb56d103" }, - "nvim-lspconfig": { "branch": "master", "commit": "6ecab74936b16b8a4d76246906b729e546220f1b" }, + "nvim-lspconfig": { "branch": "master", "commit": "911167921d49cd5c1c9b2436031d0da3945e787f" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-recorder": { "branch": "main", "commit": "ce96792c1ff750977fc3affc56f0561b0c20a7e2" }, "nvim-spectre": { "branch": "master", "commit": "ba7fb777edff6c1fbbeffd343e113af64c04e90a" }, - "nvim-treesitter": { "branch": "master", "commit": "0b8b78f9d08dc338a146eb4cd4bcbed8dd36a783" }, + "nvim-treesitter": { "branch": "master", "commit": "e085c614fcd716eedb8e2e55bae2ccad4becd40d" }, "nvim-treesitter-context": { "branch": "master", "commit": "0f3332788e0bd37716fbd25f39120dcfd557c90f" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "41e3abf6bfd9a9a681eb1f788bdeba91c9004b2b" }, "nvim-ts-autotag": { "branch": "main", "commit": "0cb76eea80e9c73b88880f0ca78fbd04c5bdcac7" }, @@ -78,10 +77,10 @@ "termim.nvim": { "branch": "main", "commit": "58344167abb97bcef9bf720a762ea653a94e9daa" }, "toggleterm.nvim": { "branch": "main", "commit": "48be57eaba817f038d61bbf64d2c597f578c0827" }, "trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" }, - "ultimate-autopair.nvim": { "branch": "v0.6", "commit": "1420fb9e07b1d80cc6d87e7d90827fb2c1109cb3" }, + "ultimate-autopair.nvim": { "branch": "v0.6", "commit": "53ed7c65e466963c916251f9ce6df7dd3685dc36" }, "vim-dadbod": { "branch": "master", "commit": "7888cb7164d69783d3dce4e0283decd26b82538b" }, "vim-dadbod-completion": { "branch": "master", "commit": "880f7e9f2959e567c718d52550f9fae1aa07aa81" }, - "vim-dadbod-ui": { "branch": "master", "commit": "0f51d8de368c8c6220973e8acd156d17da746f4c" }, + "vim-dadbod-ui": { "branch": "master", "commit": "2f344874918a3ab6bbe68fb866b3f003a639a5d2" }, "vim-maximizer": { "branch": "master", "commit": "2e54952fe91e140a2e69f35f22131219fcd9c5f1" }, "vim-wakatime": { "branch": "master", "commit": "53bba6bb8342de9cbdafc82142a9b5e82008d858" }, "which-key.nvim": { "branch": "main", "commit": "6c1584eb76b55629702716995cca4ae2798a9cca" }, diff --git a/lua/plugins/other.lua b/lua/plugins/other.lua index 1210907..d94ec4d 100644 --- a/lua/plugins/other.lua +++ b/lua/plugins/other.lua @@ -142,6 +142,7 @@ return { }, { "wakatime/vim-wakatime", + event = { "VimEnter" }, lazy = false, }, { diff --git a/mason-lock.json b/mason-lock.json index dcc7023..5531827 100644 --- a/mason-lock.json +++ b/mason-lock.json @@ -9,7 +9,6 @@ "emmet-ls": "0.4.2", "eslint-lsp": "4.10.0", "eslint_d": "14.0.3", - "golangci-lint": "v1.60.2", "google-java-format": "v1.23.0", "hadolint": "v2.12.0", "html-lsp": "4.10.0", @@ -20,23 +19,16 @@ "markdownlint": "0.41.0", "prettier": "3.3.3", "prettierd": "0.25.3", - "proselint": "0.14.0", "pylint": "3.2.6", "pyright": "1.1.377", "python-lsp-server": "1.11.0", - "rubocop": "1.65.1", - "ruff-lsp": "0.0.55", - "rust-analyzer": "2024-08-19", "selene": "0.27.1", - "shellcheck": "v0.10.0", "shfmt": "v3.9.0", - "solargraph": "0.50.0", "stylua": "v0.20.0", - "tailwindcss-language-server": "0.0.22", + "tailwindcss-language-server": "0.0.23", "trivy": "v0.54.1", "typescript-language-server": "4.3.3", "typos-lsp": "v0.1.22", "vim-language-server": "2.3.1", - "vint": "0.3.21", - "write-good": "1.0.8" + "vint": "0.3.21" } \ No newline at end of file