Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(icons)!: update icon codepoints #447

Merged
merged 5 commits into from
May 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dots.tutor
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ Back to the left window, the status line is showed at the bottom of the window.
You will see different content under different conditions. It will looks like
this if you switch to the right window and move cursor to the second line.
-------------------------------------------------------------------------------
|Normal|main| autocmd |~/.config/nvim|utf-8|LF|1%|2:1|
|Normal|main| 󰅩 autocmd |~/.config/nvim|utf-8|LF|1%|2:1|
-------------------------------------------------------------------------------
" autocmd" indicates this line has a variable named "autocmd". So this part of
"󰅩 autocmd" indicates this line has a variable named "autocmd". So this part of
status line will show you the context of your cursor position. This feature
is based on lsp, so it is disabled if corresponding lsp is not attach to current
buffer.
Expand Down
17 changes: 17 additions & 0 deletions init.lua
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
if not vim.g.vscode then
require("core")

-- Release note
vim.schedule(function()
vim.notify_once(
[[
We've released version v3.0.0!
Visit https://github.com/ayamir/nvimdots/releases to see the release notes.
If you have icons that can't be rendered correctly (e.g., 𑨩 and � ) or icons with incorrect size, be sure to read this!

To silence this message, remove it from `init.lua` at the config's root directory.

To check the glyphs size, make sure the following icons are very close to the crosses but there is no overlap:
XXXXXXXXX
]],
vim.log.levels.WARN
)
end)
end
8 changes: 4 additions & 4 deletions lua/core/settings.lua
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ settings["use_ssh"] = true
---@type boolean
settings["format_on_save"] = true

-- Set it to false if diagnostics virtual text is annoying for you
---@type boolean
settings["diagnostics_virtual_text"] = true

-- Set the format disabled directories here, files under these dirs won't be formatted on save.
---@type string[]
settings["format_disabled_dirs"] = {
Expand Down Expand Up @@ -90,8 +94,4 @@ settings["null_ls_deps"] = {
"vint",
}

-- Set the inline_diagnostic_virtual_text to false if they are annoying for you
---@type boolean
settings["inline_diagnostic_virtual_text"] = true

return settings
2 changes: 1 addition & 1 deletion lua/modules/configs/completion/lsp.lua
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ return function()
vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, {
signs = true,
underline = true,
virtual_text = require("core.settings").inline_diagnostic_virtual_text,
virtual_text = require("core.settings").diagnostics_virtual_text,
-- set update_in_insert to false bacause it was enabled by lspsaga
update_in_insert = false,
})
Expand Down
8 changes: 4 additions & 4 deletions lua/modules/configs/tool/nvim-tree.lua
Original file line number Diff line number Diff line change
Expand Up @@ -66,17 +66,17 @@ return function()
git = true,
},
padding = " ",
symlink_arrow = " ",
symlink_arrow = " 󰁔 ",
glyphs = {
default = icons.documents.Default, --
symlink = icons.documents.Symlink, --
bookmark = icons.ui.Bookmark,
git = {
unstaged = icons.git.Mod_alt,
staged = icons.git.Add, --
staged = icons.git.Add, --󰄬
unmerged = icons.git.Unmerged,
renamed = icons.git.Rename, --
untracked = icons.git.Untracked, -- ""
renamed = icons.git.Rename, --󰁔
untracked = icons.git.Untracked, -- "󰞋"
deleted = icons.git.Remove, --
ignored = icons.git.Ignore, --◌
},
Expand Down
8 changes: 4 additions & 4 deletions lua/modules/configs/ui/alpha.lua
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ return function()
require("telescope").extensions.frecency.frecency()
end,
}),
button("space f e", " File history", leader, nil, {
button("space f e", "󰋚 File history", leader, nil, {
noremap = true,
silent = true,
nowait = true,
Expand All @@ -93,7 +93,7 @@ return function()
require("telescope").extensions.projects.projects({})
end,
}),
button("space f f", " File find", leader, nil, {
button("space f f", "󰈞 File find", leader, nil, {
noremap = true,
silent = true,
nowait = true,
Expand Down Expand Up @@ -124,13 +124,13 @@ return function()
local stats = require("lazy").stats()
local ms = (math.floor(stats.startuptime * 100 + 0.5) / 100)
return "  Have Fun with neovim"
.. " v"
.. " 󰀨 v"
.. vim.version().major
.. "."
.. vim.version().minor
.. "."
.. vim.version().patch
.. " "
.. " 󰂖 "
.. stats.count
.. " plugins in "
.. ms
Expand Down
1 change: 1 addition & 0 deletions lua/modules/configs/ui/lualine.lua
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ return function()
error = icons.diagnostics.Error,
warn = icons.diagnostics.Warning,
info = icons.diagnostics.Information,
hint = icons.diagnostics.Hint_alt,
},
},
{ get_cwd },
Expand Down
117 changes: 59 additions & 58 deletions lua/modules/utils/icons.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,34 @@ local icons = {}

local data = {
kind = {
Class = "",
Color = "",
Constant = "",
Class = "󰠱",
Color = "󰏘",
Constant = "󰏿",
Constructor = "",
Enum = "",
EnumMember = "",
Event = "",
Field = "",
File = "",
Folder = "",
Function = "",
Field = "󰇽",
File = "󰈙",
Folder = "󰉋",
Function = "󰊕",
Interface = "",
Keyword = "",
Method = "",
Keyword = "󰌋",
Method = "󰆧",
Module = "",
Namespace = "",
Namespace = "󰌗",
Number = "",
Operator = "",
Operator = "󰆕",
Package = "",
Property = "",
Property = "󰜢",
Reference = "",
Snippet = "",
Struct = "",
Text = "",
TypeParameter = "",
Unit = "",
Text = "󰉿",
TypeParameter = "󰅲",
Undefined = "",
Value = "",
Unit = "",
Value = "󰎠",
Variable = "",
-- ccls-specific icons.
TypeAlias = "",
Expand All @@ -38,34 +38,34 @@ local data = {
Macro = "",
},
type = {
Array = "",
Array = "󰅪",
Boolean = "",
Null = "",
Null = "󰟢",
Number = "",
Object = "",
String = "",
Object = "󰅩",
String = "󰉿",
},
documents = {
Default = "",
File = "",
Files = "",
FileTree = "",
FileTree = "󰙅",
Import = "",
Symlink = "",
},
git = {
Add = "",
Branch = "",
Diff = "",
Git = "",
Git = "󰊢",
Ignore = "",
Mod = "M",
Mod_alt = "",
Remove = "",
Rename = "",
Repo = "",
Unmerged = "",
Untracked = "",
Unmerged = "󰘬",
Untracked = "󰞋",
Unstaged = "",
Staged = "",
Conflict = "",
Expand All @@ -75,55 +75,55 @@ local data = {
ArrowOpen = "",
BigCircle = "",
BigUnfilledCircle = "",
BookMark = "",
BookMark = "󰃃",
Bug = "",
Calendar = "",
Check = "",
Check = "󰄳",
ChevronRight = "",
Circle = "",
Close = "",
Close = "󰅖",
Close_alt = "",
CloudDownload = "",
Comment = "",
CodeAction = "",
Comment = "󰅺",
CodeAction = "󰌵",
Dashboard = "",
Emoji = "",
Emoji = "󰱫",
EmptyFolder = "",
EmptyFolderOpen = "",
File = "",
File = "󰈤",
Fire = "",
Folder = "",
FolderOpen = "",
Gear = "",
History = "",
Incoming = "",
History = "󰄉",
Incoming = "󰏷",
Indicator = "",
Keyboard = "",
Left = "",
List = "",
Square = "",
SymlinkFolder = "",
Lock = "",
Lock = "󰍁",
Modified = "✥",
Modified_alt = "",
NewFile = "",
Newspaper = "",
Note = "",
Outgoing = "",
Note = "󰍨",
Outgoing = "󰏻",
Package = "",
Pencil = "",
Perf = "",
Pencil = "󰏫",
Perf = "󰅒",
Play = "",
Project = "",
Right = "",
RootFolderOpened = "",
Search = "",
Search = "󰍉",
Separator = "",
DoubleSeparator = "",
DoubleSeparator = "󰄾",
SignIn = "",
SignOut = "",
Sort = "",
Spell = "",
Spell = "󰓆",
Symlink = "",
Table = "",
Telescope = "",
Expand All @@ -133,21 +133,21 @@ local data = {
Warning = "",
Information = "",
Question = "",
Hint = "",
Hint = "󰌵",
-- Holo version
Error_alt = "",
Warning_alt = "",
Error_alt = "󰅚",
Warning_alt = "󰀪",
Information_alt = "",
Question_alt = "",
Hint_alt = "",
Hint_alt = "󰌶",
},
misc = {
Campass = "",
Campass = "󰀹",
Code = "",
EscapeST = "",
EscapeST = "",
Gavel = "",
Glass = "",
PyEnv = "",
Glass = "󰂖",
PyEnv = "󰌠",
Squirrel = "",
Tag = "",
Tree = "",
Expand All @@ -156,45 +156,46 @@ local data = {
Vbar = "│",
Add = "+",
Added = "",
Ghost = "",
Ghost = "󰊠",
ManUp = "",
Vim = "",
},
cmp = {
Codeium = "",
TabNine = "",
Copilot = "",
Copilot_alt = "",
-- Add source-specific icons here
buffer = "",
cmp_tabnine = "",
codeium = "",
copilot = "",
copilot_alt = "",
latex_symbols = "",
luasnip = "",
luasnip = "󰃐",
nvim_lsp = "",
nvim_lua = "",
orgmode = "",
path = "",
spell = "",
spell = "󰓆",
tmux = "",
treesitter = "",
undefined = "",
},
dap = {
Breakpoint = "",
BreakpointCondition = "",
Breakpoint = "󰝥",
BreakpointCondition = "󰟃",
BreakpointRejected = "",
LogPoint = "",
Pause = "",
Play = "",
RunLast = "↻",
StepBack = "",
StepInto = "",
StepOut = "",
StepOver = "",
StepInto = "󰆹",
StepOut = "󰆸",
StepOver = "󰆷",
Stopped = "",
Terminate = "",
Terminate = "󰝤",
},
}

Expand Down