diff options
Diffstat (limited to 'lua')
| -rw-r--r-- | lua/lvim/core/lualine/components.lua | 3 | ||||
| -rw-r--r-- | lua/lvim/core/nvimtree.lua | 9 | ||||
| -rw-r--r-- | lua/lvim/core/telescope.lua | 16 | ||||
| -rw-r--r-- | lua/lvim/core/which-key.lua | 1 | ||||
| -rw-r--r-- | lua/lvim/lsp/config.lua | 1 | ||||
| -rw-r--r-- | lua/lvim/lsp/utils.lua | 2 | ||||
| -rw-r--r-- | lua/lvim/plugins.lua | 16 | 
7 files changed, 32 insertions, 16 deletions
| diff --git a/lua/lvim/core/lualine/components.lua b/lua/lvim/core/lualine/components.lua index b89bbd36..49a8ff81 100644 --- a/lua/lvim/core/lualine/components.lua +++ b/lua/lvim/core/lualine/components.lua @@ -110,7 +110,8 @@ return {        local supported_linters = linters.list_registered(buf_ft)        vim.list_extend(buf_client_names, supported_linters) -      return "[" .. table.concat(buf_client_names, ", ") .. "]" +      local unique_client_names = vim.fn.uniq(buf_client_names) +      return "[" .. table.concat(unique_client_names, ", ") .. "]"      end,      color = { gui = "bold" },      cond = conditions.hide_in_width, diff --git a/lua/lvim/core/nvimtree.lua b/lua/lvim/core/nvimtree.lua index 7f50f256..9d7ab069 100644 --- a/lua/lvim/core/nvimtree.lua +++ b/lua/lvim/core/nvimtree.lua @@ -148,7 +148,6 @@ function M.config()        },      },    } -  lvim.builtin.which_key.mappings["e"] = { "<cmd>NvimTreeToggle<CR>", "Explorer" }  end  function M.setup() @@ -158,10 +157,14 @@ function M.setup()      return    end -  for opt, val in pairs(lvim.builtin.nvimtree) do -    vim.g["nvim_tree_" .. opt] = val +  if lvim.builtin.nvimtree._setup_called then +    Log:debug "ignoring repeated setup call for nvim-tree, see kyazdani42/nvim-tree.lua#1308" +    return    end +  lvim.builtin.which_key.mappings["e"] = { "<cmd>NvimTreeToggle<CR>", "Explorer" } +  lvim.builtin.nvimtree._setup_called = true +    -- Implicitly update nvim-tree when project module is active    if lvim.builtin.project.active then      lvim.builtin.nvimtree.setup.respect_buf_cwd = true diff --git a/lua/lvim/core/telescope.lua b/lua/lvim/core/telescope.lua index 6a04a866..f556913b 100644 --- a/lua/lvim/core/telescope.lua +++ b/lua/lvim/core/telescope.lua @@ -70,14 +70,14 @@ function M.config()        borderchars = { "─", "│", "─", "│", "â•", "â•®", "╯", "â•°" },        color_devicons = true,        set_env = { ["COLORTERM"] = "truecolor" }, -- default = nil, -      pickers = { -        find_files = { -          hidden = true, -        }, -        live_grep = { -          --@usage don't include the filename in the search results -          only_sort_text = true, -        }, +    }, +    pickers = { +      find_files = { +        hidden = true, +      }, +      live_grep = { +        --@usage don't include the filename in the search results +        only_sort_text = true,        },      },      extensions = { diff --git a/lua/lvim/core/which-key.lua b/lua/lvim/core/which-key.lua index b1ae6f87..3015781b 100644 --- a/lua/lvim/core/which-key.lua +++ b/lua/lvim/core/which-key.lua @@ -244,6 +244,7 @@ M.config = function()          c = { "<cmd>Telescope colorscheme<cr>", "Colorscheme" },          f = { "<cmd>Telescope find_files<cr>", "Find File" },          h = { "<cmd>Telescope help_tags<cr>", "Find Help" }, +        H = { "<cmd>Telescope highlights<cr>", "Find highlight groups" },          M = { "<cmd>Telescope man_pages<cr>", "Man Pages" },          r = { "<cmd>Telescope oldfiles<cr>", "Open Recent File" },          R = { "<cmd>Telescope registers<cr>", "Registers" }, diff --git a/lua/lvim/lsp/config.lua b/lua/lvim/lsp/config.lua index a0e22107..1f84c4e2 100644 --- a/lua/lvim/lsp/config.lua +++ b/lua/lvim/lsp/config.lua @@ -32,6 +32,7 @@ local skipped_servers = {    "stylelint_lsp",    "tailwindcss",    "tflint", +  "svlangserver",    "verible",    "vuels",  } diff --git a/lua/lvim/lsp/utils.lua b/lua/lvim/lsp/utils.lua index 252e611c..d0e36241 100644 --- a/lua/lvim/lsp/utils.lua +++ b/lua/lvim/lsp/utils.lua @@ -176,7 +176,7 @@ function M.format(opts)    end, clients)    if #clients == 0 then -    vim.notify "[LSP] Format request failed, no matching language servers." +    vim.notify_once "[LSP] Format request failed, no matching language servers."    end    local timeout_ms = opts.timeout_ms or 1000 diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua index 9397318e..dd40b967 100644 --- a/lua/lvim/plugins.lua +++ b/lua/lvim/plugins.lua @@ -246,9 +246,19 @@ local core_plugins = {    },  } -for _, entry in ipairs(core_plugins) do -  if not os.getenv "LVIM_DEV_MODE" then -    entry["lock"] = true +local default_snapshot_path = join_paths(get_lvim_base_dir(), "snapshots", "default.json") +local content = vim.fn.readfile(default_snapshot_path) +local default_sha1 = vim.fn.json_decode(content) + +local get_default_sha1 = function(spec) +  local short_name, _ = require("packer.util").get_plugin_short_name(spec) +  return default_sha1[short_name] and default_sha1[short_name].commit +end + +for _, spec in ipairs(core_plugins) do +  if not vim.env.LVIM_DEV_MODE then +    -- Manually lock the commit hash since Packer's snapshots are unreliable in headless mode +    spec["commit"] = get_default_sha1(spec)    end  end | 
