From 89452cffd57fd93d928b35b98adf26c87d4cb2a9 Mon Sep 17 00:00:00 2001 From: ADoyle Date: Sat, 25 Nov 2023 03:18:26 +0800 Subject: [PATCH] fix: some icons were updated and moved to new codepoints for nerdfont v3.0.0 --- lua/one/config/symbol.lua | 56 ++++++++++++------------ lua/one/plugins/alpha.lua | 10 ++--- lua/one/plugins/barbar.lua | 4 +- lua/one/plugins/bufferline.lua | 2 +- lua/one/plugins/dap/init.lua | 2 +- lua/one/plugins/dap/ui.lua | 6 +-- lua/one/plugins/indent-line.lua | 2 +- lua/one/plugins/neo-tree.lua | 15 +++---- lua/one/plugins/noice.lua | 2 +- lua/one/plugins/nvim-tree.lua | 4 +- lua/one/plugins/tabby.lua | 2 +- lua/one/plugins/telescope/extensions.lua | 4 +- lua/one/plugins/telescope/main.lua | 4 +- lua/one/plugins/todo.lua | 6 +-- 14 files changed, 58 insertions(+), 61 deletions(-) diff --git a/lua/one/config/symbol.lua b/lua/one/config/symbol.lua index b0b7a6a..3ed4c10 100644 --- a/lua/one/config/symbol.lua +++ b/lua/one/config/symbol.lua @@ -1,29 +1,29 @@ return { symbolMap = { DEBUG = '', --  - ERROR = '', --  + ERROR = '󰅚', --  INFO = '', --  TRACE = '', WARN = '', --  OTHER = '', - HINT = '', + HINT = '󰌶', LOCK = '', BRANCH = '', - INSTALLED = '', - UNINSTALLED = '', - PENDING = '', + INSTALLED = '󰄲', + UNINSTALLED = '󰄱', + PENDING = '󰅢', MID_DOT = '•', - RENAMED = '', + RENAMED = '󰁕', DELETED = '', -- '✖' ADDED = '✚', -- '✚' MODIFIED = '', GIT_UNTRACKED = '', - GIT_STAGED = '', + GIT_STAGED = '󰃨', GIT_IGNORED = '', GIT_UNSTAGED = '*', GIT_CONFLICT = '', - BOOKMARK = '笠', - BOOKMARK_ANNOTATION = 'ﰠ', + BOOKMARK = '󰓹', + BOOKMARK_ANNOTATION = '󰜢', ARROW_UP = '↑', ARROW_DOWN = '↓', ARROW_LEFT = '←', @@ -36,38 +36,38 @@ return { }, kindSymbolMap = { - Array = '', + Array = '󰅪', Boolean = '◩', - Class = 'ﴯ', + Class = '󰠱', Collapsed = '', - Color = '', + Color = '󰏘', Constant = '🄲', Constructor = '', Enum = '', EnumMember = '', Event = '', - Field = '', -- 'ﰠ', - File = '', - Folder = '', - Function = '', - Interface = '', -- '' - Keyword = '', - Method = '', + Field = '', -- '󰜢', + File = '󰈙', + Folder = '󰉋', + Function = '󰊕', + Interface = '', -- '󰌗' + Keyword = '󰌋', + Method = '󰊕', Module = '', Namespace = '', Null = '∅', - Number = '', - Object = '', - Operator = '', + Number = '󰎠', + Object = '󰅩', + Operator = '󰆕', Package = '', - Property = '', - Reference = '', + Property = '󰆧', + Reference = '󰈇', Snippet = '', String = '', - Struct = 'פּ', - Text = '', - TypeParameter = '𝕋', -- '' - Unit = '塞', + Struct = '󰙅', + Text = '󰉿', + TypeParameter = '𝕋', -- '󰊄' + Unit = '󰑭', Variable = '𝕍', -- '', '𝒗' }, } diff --git a/lua/one/plugins/alpha.lua b/lua/one/plugins/alpha.lua index f248434..c042aa6 100644 --- a/lua/one/plugins/alpha.lua +++ b/lua/one/plugins/alpha.lua @@ -259,15 +259,15 @@ M.defaultConfig = function() button('m', ' File Explorer'), button('r', ' Recently Opened Files'), button('f', ' Search File'), - button('/', ' Search Contents'), + button('/', '󰈞 Search Contents'), button('k', ' List Keymaps'), button('s', ' List Sessions'), - button('p', 'גּ Run Command'), + button('p', '󰘳 Run Command'), button('P', ' List Plugin Status'), button('v', ' List Vim Options'), - button('n', ' List Messages'), - button('N', ' List Notifications'), - button('h', 'ﲉ Find Help'), + button('n', '󰍩 List Messages'), + button('N', '󰍢 List Notifications'), + button('h', '󰞋 Find Help'), button('q', ' Quit', ':qa'), }, opts = { spacing = 0 }, diff --git a/lua/one/plugins/barbar.lua b/lua/one/plugins/barbar.lua index 9ea2fbe..70b0ff3 100644 --- a/lua/one/plugins/barbar.lua +++ b/lua/one/plugins/barbar.lua @@ -93,9 +93,9 @@ M.defaultConfig = { -- Configure icons on the bufferline. icon_separator_active = '▎', icon_separator_inactive = ' ', - icon_close_tab = '', + icon_close_tab = '󰅖', icon_close_tab_modified = '●', -- '*' - icon_pinned = '車', + icon_pinned = '󰐃', -- If true, new buffers will be inserted at the start/end of the list. -- Default is to insert after current buffer. diff --git a/lua/one/plugins/bufferline.lua b/lua/one/plugins/bufferline.lua index a90aa6b..0c540e2 100644 --- a/lua/one/plugins/bufferline.lua +++ b/lua/one/plugins/bufferline.lua @@ -61,7 +61,7 @@ M.defaultConfig = function(config) show_tab_indicators = true, show_duplicate_prefix = true, show_close_icon = false, - buffer_close_icon = '', + buffer_close_icon = '󰅖', modified_icon = '*', close_icon = '', left_trunc_marker = '', diff --git a/lua/one/plugins/dap/init.lua b/lua/one/plugins/dap/init.lua index 344495c..e141369 100644 --- a/lua/one/plugins/dap/init.lua +++ b/lua/one/plugins/dap/init.lua @@ -26,7 +26,7 @@ M.defaultConfig = { }, } ---  +-- 󰆹󰆷󰆸 M.signs = { DapBreakpoint = { text = 'B' }, DapBreakpointCondition = { text = 'C' }, diff --git a/lua/one/plugins/dap/ui.lua b/lua/one/plugins/dap/ui.lua index 474a61b..5a24bf7 100644 --- a/lua/one/plugins/dap/ui.lua +++ b/lua/one/plugins/dap/ui.lua @@ -70,9 +70,9 @@ return { icons = { pause = '', play = '', - step_into = '', - step_over = '', - step_out = '', + step_into = '󰆹', + step_over = '󰆷', + step_out = '󰆸', step_back = '', run_last = '↻', terminate = '□', diff --git a/lua/one/plugins/indent-line.lua b/lua/one/plugins/indent-line.lua index f2e0edb..130a853 100644 --- a/lua/one/plugins/indent-line.lua +++ b/lua/one/plugins/indent-line.lua @@ -16,7 +16,7 @@ local M = { M.defaultConfig = { 'indentLine', { - line = '▏', -- '┊', '', '⎜', '⎸', '│', '⎜', '⎜', '⎜' + line = '▏', -- '┊', '󰇙', '⎜', '⎸', '│', '⎜', '⎜', '⎜' excludeFileType = { 'alpha', -- goolord/alpha-nvim, see plugins/alpha.lua }, diff --git a/lua/one/plugins/neo-tree.lua b/lua/one/plugins/neo-tree.lua index 6adfe0c..8df401b 100644 --- a/lua/one/plugins/neo-tree.lua +++ b/lua/one/plugins/neo-tree.lua @@ -161,7 +161,7 @@ M.defaultConfig = function(config) folder_empty = '', -- The next two settings are only a fallback, if you use nvim-web-devicons and configure default icons there -- then these will never be used. - default = '', + default = '󰈙', highlight = 'NeoTreeFileIcon', }, @@ -399,11 +399,11 @@ M.defaultConfig = function(config) -- source = '', -- string -- display_name = '', -- string | nil -- }, - { source = 'filesystem', display_name = '  File' }, - { source = 'buffers', display_name = '﬘ Buf' }, - { source = 'git_status', display_name = ' Git' }, - { source = 'diagnostics', display_name = '裂Diag' }, - { source = 'zk', display_name = '﬷ ZK' }, + { source = 'filesystem', display_name = ' 󰈢 File' }, + { source = 'buffers', display_name = '󰽘 Buf' }, + { source = 'git_status', display_name = '󰊢 Git' }, + { source = 'diagnostics', display_name = '󰒡Diag' }, + { source = 'zk', display_name = '󰘸 ZK' }, }, content_layout = 'start', -- string tabs_layout = 'equal', -- string @@ -494,11 +494,8 @@ end M.keymaps = { { 'n', 'b', ':Neotree toggle show buffers', { silent = true } }, - { 'n', 'g', ':Neotree toggle show git_status', { silent = true } }, - { 'n', 'm', ':Neotree toggle reveal', { silent = true } }, - { 'n', 'M', ':Neotree focus reveal', { silent = true } }, } diff --git a/lua/one/plugins/noice.lua b/lua/one/plugins/noice.lua index b415ea9..dbc4037 100644 --- a/lua/one/plugins/noice.lua +++ b/lua/one/plugins/noice.lua @@ -88,7 +88,7 @@ M.defaultConfig = function() search_down = { kind = 'search', pattern = '^/', icon = '', lang = 'regex' }, search_up = { kind = 'search', pattern = '^%?', icon = ' ', lang = 'regex' }, filter = { pattern = '^:%s*!', icon = '', lang = 'bash' }, - man = { pattern = '^:%s*Man%s+', icon = '龎', lang = 'bash' }, + man = { pattern = '^:%s*Man%s+', icon = '󰗚', lang = 'bash' }, lua = { pattern = '^:%s*lua%s+', icon = '', lang = 'lua' }, help = { pattern = '^:%s*he?l?p?%s+', icon = '󰱼' }, input = {}, -- Used by input() diff --git a/lua/one/plugins/nvim-tree.lua b/lua/one/plugins/nvim-tree.lua index 23ec2e6..92d6c7f 100644 --- a/lua/one/plugins/nvim-tree.lua +++ b/lua/one/plugins/nvim-tree.lua @@ -47,8 +47,8 @@ local M = { glyphs = { git = { - unstaged = '', - staged = '', + unstaged = '󰄱', + staged = '󰃨', unmerged = '', renamed = '➜', untracked = '', diff --git a/lua/one/plugins/tabby.lua b/lua/one/plugins/tabby.lua index 4c6c307..f8aabae 100644 --- a/lua/one/plugins/tabby.lua +++ b/lua/one/plugins/tabby.lua @@ -61,7 +61,7 @@ local function renderTab(tab) } if config.tabby.showTabClose then - table.insert(list, 3, tab.close_btn('')) + table.insert(list, 3, tab.close_btn('󰅖')) table.insert(list, 3, ' ') end else diff --git a/lua/one/plugins/telescope/extensions.lua b/lua/one/plugins/telescope/extensions.lua index e38c53a..7d745e9 100644 --- a/lua/one/plugins/telescope/extensions.lua +++ b/lua/one/plugins/telescope/extensions.lua @@ -1,6 +1,6 @@ return { ['ts-parsers'] = { - desc = 'List nvim-treesitter parsers.  means installed.  is not. Press to install/update them.', + desc = 'List nvim-treesitter parsers. 󰄲 means installed. 󰄱 is not. Press to install/update them.', command = function() local parsers = require('nvim-treesitter.parsers').available_parsers() @@ -11,7 +11,7 @@ return { local installed = #api.nvim_get_runtime_file('parser/' .. lang .. '.so', false) > 0 list[i] = { - text = string.format('%s %s', installed and '' or '', lang), + text = string.format('%s %s', installed and '󰄲' or '󰄱', lang), entry = { ordinal = lang }, lang = lang, installed, diff --git a/lua/one/plugins/telescope/main.lua b/lua/one/plugins/telescope/main.lua index e139768..221faee 100644 --- a/lua/one/plugins/telescope/main.lua +++ b/lua/one/plugins/telescope/main.lua @@ -202,10 +202,10 @@ M.defaultConfig = function(config) buffers = {}, - live_grep = { prompt_prefix = '  ' }, + live_grep = { prompt_prefix = ' 󰈞 ' }, current_buffer_fuzzy_find = { - prompt_prefix = '  ', + prompt_prefix = ' 󰈞 ', layout_config = { preview_height = { 0.2, min = 4, max = 6 }, height = { 0.9, min = 10, max = 40 }, diff --git a/lua/one/plugins/todo.lua b/lua/one/plugins/todo.lua index 8ae6f8b..afc4f5d 100644 --- a/lua/one/plugins/todo.lua +++ b/lua/one/plugins/todo.lua @@ -42,9 +42,9 @@ M.defaultConfig = { TODO = { icon = '', color = 'info', alt = { 'Todo' } }, HACK = { icon = '', color = 'warning', alt = { 'Hack' } }, WARN = { icon = '', color = 'warning', alt = { 'Warn', 'WARNING', 'XXX' } }, - PERF = { icon = '', alt = { 'Perf', 'OPTIM', 'PERFORMANCE', 'OPTIMIZE' } }, - NOTE = { icon = '', color = 'hint', alt = { 'Note', 'INFO', 'Info' } }, - TEST = { icon = 'ﭧ', color = 'test', alt = { 'Test', 'TESTING', 'PASSED', 'FAILED' } }, + PERF = { icon = '󰅒', alt = { 'Perf', 'OPTIM', 'PERFORMANCE', 'OPTIMIZE' } }, + NOTE = { icon = '󰍨', color = 'hint', alt = { 'Note', 'INFO', 'Info' } }, + TEST = { icon = '󰙨', color = 'test', alt = { 'Test', 'TESTING', 'PASSED', 'FAILED' } }, }, gui_style = {