diff options
Diffstat (limited to 'lua/lvim')
| -rw-r--r-- | lua/lvim/config/defaults.lua | 2 | ||||
| -rw-r--r-- | lua/lvim/core/bufferline.lua | 9 | ||||
| -rw-r--r-- | lua/lvim/core/cmp.lua | 4 | ||||
| -rw-r--r-- | lua/lvim/core/dap.lua | 8 | ||||
| -rw-r--r-- | lua/lvim/core/lualine/styles.lua | 6 | ||||
| -rw-r--r-- | lua/lvim/core/notify.lua | 9 | ||||
| -rw-r--r-- | lua/lvim/core/nvimtree.lua | 11 | ||||
| -rw-r--r-- | lua/lvim/lsp/init.lua | 6 | ||||
| -rw-r--r-- | lua/lvim/plugins.lua | 5 |
9 files changed, 42 insertions, 18 deletions
diff --git a/lua/lvim/config/defaults.lua b/lua/lvim/config/defaults.lua index fe2780eb..54bbc67e 100644 --- a/lua/lvim/config/defaults.lua +++ b/lua/lvim/config/defaults.lua @@ -10,6 +10,8 @@ return { }, keys = {}, + use_icons = true, + builtin = {}, plugins = { diff --git a/lua/lvim/core/bufferline.lua b/lua/lvim/core/bufferline.lua index d16c3d79..cb322032 100644 --- a/lua/lvim/core/bufferline.lua +++ b/lua/lvim/core/bufferline.lua @@ -4,9 +4,12 @@ local function is_ft(b, ft) return vim.bo[b].filetype == ft end -local function diagnostics_indicator(_, _, diagnostics) +local function diagnostics_indicator(num, _, diagnostics, _) local result = {} local symbols = { error = "", warning = "", info = "" } + if not lvim.use_icons then + return "(" .. num .. ")" + end for name, count in pairs(diagnostics) do if symbols[name] and count > 0 then table.insert(result, symbols[name] .. " " .. count) @@ -112,8 +115,8 @@ M.config = function() padding = 1, }, }, - show_buffer_icons = true, -- disable filetype icons for buffers - show_buffer_close_icons = true, + show_buffer_icons = lvim.use_icons, -- disable filetype icons for buffers + show_buffer_close_icons = lvim.use_icons, show_close_icon = false, show_tab_indicators = true, persist_buffer_sort = true, -- whether or not custom sorted buffers should persist diff --git a/lua/lvim/core/cmp.lua b/lua/lvim/core/cmp.lua index 4eff9883..56aece0c 100644 --- a/lua/lvim/core/cmp.lua +++ b/lua/lvim/core/cmp.lua @@ -220,7 +220,9 @@ M.config = function() if max_width ~= 0 and #vim_item.abbr > max_width then vim_item.abbr = string.sub(vim_item.abbr, 1, max_width - 1) .. "…" end - vim_item.kind = lvim.builtin.cmp.formatting.kind_icons[vim_item.kind] + if lvim.use_icons then + vim_item.kind = lvim.builtin.cmp.formatting.kind_icons[vim_item.kind] + end vim_item.menu = lvim.builtin.cmp.formatting.source_names[entry.source.name] vim_item.dup = lvim.builtin.cmp.formatting.duplicates[entry.source.name] or lvim.builtin.cmp.formatting.duplicates_default diff --git a/lua/lvim/core/dap.lua b/lua/lvim/core/dap.lua index d9b59641..8f7eb294 100644 --- a/lua/lvim/core/dap.lua +++ b/lua/lvim/core/dap.lua @@ -28,9 +28,11 @@ end M.setup = function() local dap = require "dap" - vim.fn.sign_define("DapBreakpoint", lvim.builtin.dap.breakpoint) - vim.fn.sign_define("DapBreakpointRejected", lvim.builtin.dap.breakpoint_rejected) - vim.fn.sign_define("DapStopped", lvim.builtin.dap.stopped) + if lvim.use_icons then + vim.fn.sign_define("DapBreakpoint", lvim.builtin.dap.breakpoint) + vim.fn.sign_define("DapBreakpointRejected", lvim.builtin.dap.breakpoint_rejected) + vim.fn.sign_define("DapStopped", lvim.builtin.dap.stopped) + end dap.defaults.fallback.terminal_win_cmd = "50vsplit new" diff --git a/lua/lvim/core/lualine/styles.lua b/lua/lvim/core/lualine/styles.lua index 45c6c639..8991d9d9 100644 --- a/lua/lvim/core/lualine/styles.lua +++ b/lua/lvim/core/lualine/styles.lua @@ -11,7 +11,7 @@ styles.none = { style = "none", options = { theme = "auto", - icons_enabled = true, + icons_enabled = lvim.use_icons, component_separators = { left = "", right = "" }, section_separators = { left = "", right = "" }, disabled_filetypes = {}, @@ -40,7 +40,7 @@ styles.default = { style = "default", options = { theme = "auto", - icons_enabled = true, + icons_enabled = lvim.use_icons, component_separators = { left = "", right = "" }, section_separators = { left = "", right = "" }, disabled_filetypes = {}, @@ -69,7 +69,7 @@ styles.lvim = { style = "lvim", options = { theme = "auto", - icons_enabled = true, + icons_enabled = lvim.use_icons, component_separators = { left = "", right = "" }, section_separators = { left = "", right = "" }, disabled_filetypes = { "alpha", "NvimTree", "Outline" }, diff --git a/lua/lvim/core/notify.lua b/lua/lvim/core/notify.lua index cb62778f..2db4c4d5 100644 --- a/lua/lvim/core/notify.lua +++ b/lua/lvim/core/notify.lua @@ -39,6 +39,15 @@ local defaults = { } function M.config() + if not lvim.use_icons then + defaults.opts.icons = { + ERROR = "[ERROR]", + WARN = "[WARNING]", + INFO = "[INFo]", + DEBUG = "[DEBUG]", + TRACE = "[TRACE]", + } + end lvim.builtin.notify = vim.tbl_deep_extend("force", defaults, lvim.builtin.notify or {}) end diff --git a/lua/lvim/core/nvimtree.lua b/lua/lvim/core/nvimtree.lua index 385708ed..d2558563 100644 --- a/lua/lvim/core/nvimtree.lua +++ b/lua/lvim/core/nvimtree.lua @@ -2,6 +2,7 @@ local M = {} local Log = require "lvim.core.log" function M.config() + local vim_show_icons = lvim.use_icons and 1 or 0 lvim.builtin.nvimtree = { active = true, on_config_done = nil, @@ -30,7 +31,7 @@ function M.config() hijack_cursor = false, update_cwd = false, diagnostics = { - enable = true, + enable = lvim.use_icons, icons = { hint = "", info = "", @@ -90,10 +91,10 @@ function M.config() }, }, show_icons = { - git = 1, - folders = 1, - files = 1, - folder_arrows = 1, + git = vim_show_icons, + folders = vim_show_icons, + files = vim_show_icons, + folder_arrows = vim_show_icons, }, git_hl = 1, root_folder_modifier = ":t", diff --git a/lua/lvim/lsp/init.lua b/lua/lvim/lsp/init.lua index d6566ae6..44923123 100644 --- a/lua/lvim/lsp/init.lua +++ b/lua/lvim/lsp/init.lua @@ -134,8 +134,10 @@ function M.setup() return end - for _, sign in ipairs(lvim.lsp.diagnostics.signs.values) do - vim.fn.sign_define(sign.name, { texthl = sign.name, text = sign.text, numhl = sign.name }) + if lvim.use_icons then + for _, sign in ipairs(lvim.lsp.diagnostics.signs.values) do + vim.fn.sign_define(sign.name, { texthl = sign.name, text = sign.text, numhl = sign.name }) + end end require("lvim.lsp.handlers").setup() diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua index 1b885a09..b5985225 100644 --- a/lua/lvim/plugins.lua +++ b/lua/lvim/plugins.lua @@ -175,7 +175,10 @@ local core_plugins = { }, -- Icons - { "kyazdani42/nvim-web-devicons" }, + { + "kyazdani42/nvim-web-devicons", + disable = not lvim.use_icons, + }, -- Status Line and Bufferline { |