diff --git a/lazy-lock.json b/lazy-lock.json index 5f203ed..b59adaa 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,5 +1,5 @@ { - "ChatGPT.nvim": { "branch": "main", "commit": "5a6287cdd90838c727cb8ac8dbd4787702445680" }, + "ChatGPT.nvim": { "branch": "main", "commit": "af509fceb70cab1867a611f3d8fad6d3e7760fb0" }, "LuaSnip": { "branch": "master", "commit": "500981ff6cefc7343e3959ef0f939bd0bfd49ba9" }, "animation.nvim": { "branch": "main", "commit": "fb77091ab72ec9971aee0562e7081182527aaa6a" }, "barbecue.nvim": { "branch": "main", "commit": "cd7e7da622d68136e13721865b4d919efd6325ed" }, @@ -16,7 +16,7 @@ "friendly-snippets": { "branch": "main", "commit": "ef6547d2f586e08e071efeebac835e545f3015cc" }, "gitsigns.nvim": { "branch": "main", "commit": "bb808fc7376ed7bac0fbe8f47b83d4bf01738167" }, "indent-blankline.nvim": { "branch": "master", "commit": "ceaf730b13e332cd76600d9795722413c236c684" }, - "lazy.nvim": { "branch": "main", "commit": "67ae8bbbe3985e380b98abeaf6c567c422b29746" }, + "lazy.nvim": { "branch": "main", "commit": "a93d8983c4335b6ae7d6e7d516a191d929186d5b" }, "lsp_signature.nvim": { "branch": "master", "commit": "4665921ff8e30601c7c1328625b3abc1427a6143" }, "lspsaga.nvim": { "branch": "main", "commit": "e39c210c5f19a01a627e1d25544e5aca52efb522" }, "lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" }, @@ -27,35 +27,35 @@ "mini.comment": { "branch": "main", "commit": "9ead47cef4266efa5145808b838762c658b74f74" }, "mini.indentscope": { "branch": "main", "commit": "f60e9b51a6214c73a170ffc5445ce91560981031" }, "mini.pairs": { "branch": "main", "commit": "771c08bd313614c7e9a1904d277ac76eb226f674" }, - "monokai-pro.nvim": { "branch": "master", "commit": "99a8d0543bf798b73ad15e4e98fdb55961da9e9d" }, + "monokai-pro.nvim": { "branch": "master", "commit": "1159576e6e3b709811a65039d4778b53f64a0245" }, "neo-tree.nvim": { "branch": "v2.x", "commit": "abad8863cb280e64663b8b67755c47c233958946" }, - "noice.nvim": { "branch": "main", "commit": "1478f7295806d354e7689edc2a58f3bc2e697f78" }, - "nui.nvim": { "branch": "main", "commit": "698e75814cd7c56b0dd8af4936bcef2d13807f3c" }, + "noice.nvim": { "branch": "main", "commit": "8e804080414e230a07f76cb13a6873109cacb6bf" }, + "nui.nvim": { "branch": "main", "commit": "7a524120a7a70761b5a65b602fd235a65cb005aa" }, "null-ls.nvim": { "branch": "main", "commit": "77e53bc3bac34cc273be8ed9eb9ab78bcf67fa48" }, "nvim": { "branch": "main", "commit": "8338b02e9a8ffcb999520de7f15943712618760f" }, - "nvim-cmp": { "branch": "main", "commit": "a0225043ab823fcad8d0d802e276d9838fb48c30" }, + "nvim-cmp": { "branch": "main", "commit": "1088b3743b83ffd8973ad65e6b5fed010da0ffd2" }, "nvim-colorizer.lua": { "branch": "master", "commit": "dde3084106a70b9a79d48f426f6d6fec6fd203f7" }, "nvim-jdtls": { "branch": "master", "commit": "a5c6f38f8151d7b4f5b32c005a95022fa66f4c9d" }, "nvim-lightbulb": { "branch": "master", "commit": "ca5b44a8efffb5fec1963ccd21f25ec04cc778b7" }, - "nvim-lspconfig": { "branch": "master", "commit": "1c0644c10638c7bb165bb614b1715107ede07542" }, + "nvim-lspconfig": { "branch": "master", "commit": "465042c0f786992212284311ebb5da1f89479774" }, "nvim-navic": { "branch": "master", "commit": "15704c607569d6c5cfeab486d3ef9459645a70ce" }, "nvim-notify": { "branch": "master", "commit": "bdd647f61a05c9b8a57c83b78341a0690e9c29d7" }, "nvim-scrollbar": { "branch": "main", "commit": "35f99d559041c7c0eff3a41f9093581ceea534e8" }, - "nvim-treesitter": { "branch": "master", "commit": "5781c94703463e675b0836d850a8950bc4d7d6b2" }, + "nvim-treesitter": { "branch": "master", "commit": "a76db88548bb7fe008cd7e4f2d2ec2ccc080dede" }, "nvim-ts-autotag": { "branch": "main", "commit": "40615e96075c743ef47aaf9de966dc348bec6459" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "0bf8fbc2ca8f8cdb6efbd0a9e32740d7a991e4c3" }, - "nvim-ts-rainbow2": { "branch": "master", "commit": "cee4601ff8aac73dee4afa1074814343bb5a0b80" }, + "nvim-ts-rainbow2": { "branch": "master", "commit": "c00d61ab7517530c49457ba49186776e6611a3e1" }, "nvim-ufo": { "branch": "main", "commit": "95a148d9b3c02facce59c2050fd20fa6e8eb2cb6" }, - "nvim-web-devicons": { "branch": "master", "commit": "e283ab937e0197b37ec5d8013e49495193407324" }, + "nvim-web-devicons": { "branch": "master", "commit": "2a125024a137677930efcfdf720f205504c97268" }, "peek.nvim": { "branch": "master", "commit": "67752e7581f88da6899838985a05705b008e4185" }, "persistence.nvim": { "branch": "main", "commit": "adcf6913693a0434665d162ee45a186230496f8a" }, "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, "promise-async": { "branch": "main", "commit": "38a4575da9497326badd3995e768b4ccf0bb153e" }, "rnvimr": { "branch": "main", "commit": "4f4fbd29e2e0869bea9a8376e06fca4331de60c9" }, - "statuscol.nvim": { "branch": "main", "commit": "7ee8d982331019fec3a90ec87b98d6b4405cacbe" }, + "statuscol.nvim": { "branch": "main", "commit": "f13a5dbe83ed500e6022e8e96d3c404aa11ebfba" }, "telescope.nvim": { "branch": "master", "commit": "6d3fbffe426794296a77bb0b37b6ae0f4f14f807" }, "toggleterm.nvim": { "branch": "main", "commit": "026dff5e2b504941cf172691561a67ea362596aa" }, - "tokyonight.nvim": { "branch": "main", "commit": "90b711c052bb3cd9692922e16bcf3861344ecf75" }, + "tokyonight.nvim": { "branch": "main", "commit": "cd5156f4b4a6c4c337a46deb0c0bd37319920833" }, "vim-bbye": { "branch": "master", "commit": "903f5eb17f72ebf7b0b1524bbb792c0b36761af6" }, "vim-illuminate": { "branch": "master", "commit": "a2907275a6899c570d16e95b9db5fd921c167502" }, "vim-startuptime": { "branch": "master", "commit": "daacd02e773944b8de312ddac83f436fae92cbb9" }, diff --git a/lua/tvl/config/lsp/servers.lua b/lua/tvl/config/lsp/servers.lua index 28c36ef..d447050 100755 --- a/lua/tvl/config/lsp/servers.lua +++ b/lua/tvl/config/lsp/servers.lua @@ -18,21 +18,6 @@ local servers = { lua_ls = { settings = { Lua = { - hint = { - enable = true, - arrayIndex = "Disable", -- "Enable", "Auto", "Disable" - await = true, - paramName = "Disable", -- "All", "Literal", "Disable" - paramType = false, - semicolon = "Disable", -- "All", "SameLine", "Disable" - setType = true, - }, - runtime = { - version = "LuaJIT", - special = { - reload = "require", - }, - }, diagnostics = { globals = { "vim" }, }, @@ -41,10 +26,19 @@ local servers = { }, completion = { callSnippet = "Replace", - autoRequire = true, }, - telemetry = { + misc = { + parameters = { + "--log-level=trace", + }, + }, + format = { enable = false, + defaultConfig = { + indent_style = "space", + indent_size = "2", + continuation_indent_size = "2", + }, }, }, }, diff --git a/lua/tvl/core/icons.lua b/lua/tvl/core/icons.lua index 45e6b78..2c624d5 100755 --- a/lua/tvl/core/icons.lua +++ b/lua/tvl/core/icons.lua @@ -52,16 +52,7 @@ return { Bug = "", }, borders = { - empty = { - top = " ", - right = " ", - bottom = " ", - left = " ", - top_left = " ", - top_right = " ", - bottom_right = " ", - bottom_left = " ", - }, + --- @class BorderIcons thin = { top = "▔", right = "▕", @@ -72,6 +63,18 @@ return { bottom_right = "🭿", bottom_left = "🭼", }, + ---@type BorderIcons + empty = { + top = " ", + right = " ", + bottom = " ", + left = " ", + top_left = " ", + top_right = " ", + bottom_right = " ", + bottom_left = " ", + }, + ---@type BorderIcons thick = { top = "▄", right = "█", diff --git a/lua/tvl/core/resources/colorscheme.lua b/lua/tvl/core/resources/colorscheme.lua index fc1aa1c..3d8423c 100755 --- a/lua/tvl/core/resources/colorscheme.lua +++ b/lua/tvl/core/resources/colorscheme.lua @@ -19,7 +19,7 @@ return { monokai.setup({ transparent_background = false, devicons = true, - filter = "pro", -- classic | octagon | pro | machine | ristretto | spectrum + filter = "spectrum", -- classic | octagon | pro | machine | ristretto | spectrum day_night = { enable = false, day_filter = "classic", diff --git a/lua/tvl/core/resources/editor.lua b/lua/tvl/core/resources/editor.lua index 35b0db8..0a39f47 100755 --- a/lua/tvl/core/resources/editor.lua +++ b/lua/tvl/core/resources/editor.lua @@ -1,3 +1,5 @@ +local Util = require("tvl.util") + return { { "loctvl842/neo-tree.nvim", @@ -47,21 +49,17 @@ return { selection_caret = "  ", entry_prefix = " ", borderchars = { - prompt = require("tvl.util").generate_borderchars( + prompt = Util.generate_borderchars( "thick", nil, { top = "█", top_left = "█", right = " ", top_right = " ", bottom_right = " " } ), - results = require("tvl.util").generate_borderchars( + results = Util.generate_borderchars( "thick", nil, { top = "█", top_left = "█", right = " ", top_right = " ", bottom_right = " " } ), - preview = require("tvl.util").generate_borderchars( - "thick", - nil, - { top = "█", top_left = "█", top_right = "█" } - ), + preview = Util.generate_borderchars("thick", nil, { top = "█", top_left = "█", top_right = "█" }), }, dynamic_preview_title = true, hl_result_eol = true, @@ -218,7 +216,7 @@ return { }, current_line_blame_formatter = ", - ", preview_config = { - border = { "▄", "▄", "▄", "█", "▀", "▀", "▀", "█" }, -- [ top top top - right - bottom bottom bottom - left ] + border = Util.generate_borderchars("thick", "tl-t-tr-r-bl-b-br-l"), -- [ top top top - right - bottom bottom bottom - left ] }, }, keys = { diff --git a/lua/tvl/core/resources/lsp.lua b/lua/tvl/core/resources/lsp.lua index 9cf1abe..1c5f3cd 100755 --- a/lua/tvl/core/resources/lsp.lua +++ b/lua/tvl/core/resources/lsp.lua @@ -88,19 +88,6 @@ return { config = function() require("mason").setup() end, - -- opts = { - -- ui = { - -- -- border = "rounded", - -- border = { "▄", "▄", "▄", "█", "▀", "▀", "▀", "█" }, - -- icons = { - -- package_installed = "◍", - -- package_pending = "◍", - -- package_uninstalled = "◍", - -- }, - -- }, - -- log_level = vim.log.levels.INFO, - -- max_concurrent_installers = 4, - -- }, }, -- formatters @@ -111,14 +98,18 @@ return { config = function() local null_ls = require("null-ls") local formatting = null_ls.builtins.formatting + local diagnostics = null_ls.builtins.diagnostics null_ls.setup({ debug = false, + -- You can then register sources by passing a sources list into your setup function: + -- using `with()`, which modifies a subset of the source's default options sources = { formatting.prettier, formatting.stylua, - formatting.black.with({ extra_args = { "--fast" } }), + formatting.black, formatting.markdownlint, formatting.beautysh.with({ extra_args = { "--indent-size", "2" } }), + diagnostics.flake8.with({ extra_args = { "--ignore=E203,E501" }, filetypes = { "python" } }), }, }) end, @@ -133,6 +124,7 @@ return { "stylua", "google_java_format", "black", + "flake8", "markdownlint", "beautysh", }, diff --git a/lua/tvl/util.lua b/lua/tvl/util.lua index 152c8ba..c27c286 100755 --- a/lua/tvl/util.lua +++ b/lua/tvl/util.lua @@ -160,15 +160,6 @@ M.notify = function(msg, level, opts) end) end ----@class BorderIcons ----@field top string ----@field right string ----@field bottom string ----@field left string ----@field top_left string ----@field top_right string ----@field bottom_right string ----@field bottom_left string --- @param type "thin" | "thick" | "empty" | nil --- @param order "t-r-b-l-tl-tr-br-bl" | "tl-t-tr-r-bl-b-br-l" | nil