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

Change font from Cica to UDEV Gothic #2

Merged
merged 5 commits into from
Dec 5, 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
16 changes: 9 additions & 7 deletions .config/alacritty/alacritty.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,22 +96,24 @@ scrolling:
multiplier: 3

font:
size: 16.0
normal:
family: "Cica"
family: "UDEV Gothic 35NF"
style: Regular
bold:
family: "Cica"
family: "UDEV Gothic 35NF"
style: Bold
italic:
family: "Cica"
family: "UDEV Gothic 35NF"
style: Italic
bold_italic:
family: "Cica"
style: Bold Itali
family: "UDEV Gothic 35NF"
style: Bold Italic

size: 14.0
offset:
y: 1
y: 8
glyph_offset:
y: 4

shell:
program: /opt/homebrew/bin/fish
Expand Down
4 changes: 3 additions & 1 deletion .config/nvim/lua/plugins/alpha-nvim.lua
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ local M = {
dashboard.button("g", " " .. " Find text", "<cmd> Telescope live_grep <cr>"),
dashboard.button("c", " " .. " Config", "<cmd> e $HOME/dev/dotfiles/.config/nvim/init.lua <cr>"),
dashboard.button("s", " " .. " Restore Session", [[<cmd> lua require("persistence").load() <cr>]]),
dashboard.button("l", "󿦱 " .. " Lazy", "<cmd> Lazy <cr>"),
dashboard.button("m", " " .. " Mason", "<cmd> Mason <cr>"),
dashboard.button("l", "󰒲 " .. " Lazy", "<cmd> Lazy <cr>"),
dashboard.button("q", " " .. " Quit", "<cmd> qa <cr>"),
}
for _, button in ipairs(dashboard.section.buttons.val) do
Expand All @@ -34,6 +35,7 @@ local M = {
end
dashboard.section.header.opts.hl = "AlphaHeader"
dashboard.section.buttons.opts.hl = "AlphaButtons"
dashboard.section.buttons.opts.spacing = 1
dashboard.section.footer.opts.hl = "AlphaFooter"
dashboard.opts.layout[1].val = 8
return dashboard
Expand Down
1 change: 0 additions & 1 deletion .config/nvim/lua/plugins/bufferline.lua
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ local M = {
text_align = "left",
},
},
buffer_close_icon = "",
},
},
}
Expand Down
4 changes: 2 additions & 2 deletions .config/nvim/lua/plugins/lualine.lua
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ return {
options = {
icons_enabled = true,
theme = "auto",
component_separators = { left = "󾂱", right = "󾂳" },
section_separators = { left = "󾂰", right = "󾂲" },
component_separators = { left = '', right = '' },
section_separators = { left = '', right = '' },
disabled_filetypes = {
statusline = { "dashboard", "alpha" },
winbar = {},
Expand Down
34 changes: 17 additions & 17 deletions .config/nvim/lua/plugins/neo-tree.lua
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ return {
expander_highlight = "NeoTreeExpander",
},
icon = {
folder_closed = "󿝊 ",
folder_open = "󿱮 ",
folder_empty = "󿝗 ",
folder_empty_open = "󿱮 ",
default = "* ",
folder_closed = "",
folder_open = "",
folder_empty = "󰉖",
folder_empty_open = "󰷏",
default = "*",
highlight = "NeoTreeFileIcon",
},
modified = {
Expand All @@ -72,15 +72,15 @@ return {
},
git_status = {
symbols = {
added = "✚",
modified = "",
deleted = "",
renamed = "",
added = "✚",
deleted = "",
modified = "",
renamed = "󰁕",
untracked = "",
ignored = "",
unstaged = "󿘰",
staged = "",
conflict = "",
ignored = "",
unstaged = "󰄱",
staged = "",
conflict = "",
},
},
},
Expand Down Expand Up @@ -194,10 +194,10 @@ return {
},
},
config = function(_, opts)
vim.fn.sign_define("DiagnosticSignError", { text = "󿙙", texthl = "DiagnosticSignError" })
vim.fn.sign_define("DiagnosticSignWarn", { text = "󿔩", texthl = "DiagnosticSignWarn" })
vim.fn.sign_define("DiagnosticSignInfo", { text = "", texthl = "DiagnosticSignInfo" })
vim.fn.sign_define("DiagnosticSignHint", { text = "", texthl = "DiagnosticSignHint" })
vim.fn.sign_define("DiagnosticSignError", { text = "", texthl = "DiagnosticSignError" })
vim.fn.sign_define("DiagnosticSignWarn", { text = "", texthl = "DiagnosticSignWarn" })
vim.fn.sign_define("DiagnosticSignInfo", { text = "", texthl = "DiagnosticSignInfo" })
vim.fn.sign_define("DiagnosticSignHint", { text = "󰌵", texthl = "DiagnosticSignHint" })

require("neo-tree").setup(opts)
end,
Expand Down
12 changes: 6 additions & 6 deletions .config/nvim/lua/plugins/noice.lua
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ return {
},
cmdline = {
format = {
cmdline = { icon = ">" },
search_down = { icon = "🔍⌄" },
search_up = { icon = "🔍⌃" },
filter = { icon = "$" },
lua = { icon = "" },
help = { icon = "?" },
cmdline = { pattern = "^:", icon = "", lang = "vim" },
search_down = { kind = "search", pattern = "^/", icon = " ", lang = "regex" },
search_up = { kind = "search", pattern = "^%?", icon = " ", lang = "regex" },
filter = { pattern = "^:%s*!", icon = "$", lang = "bash" },
lua = { pattern = { "^:%s*lua%s+", "^:%s*lua%s*=%s*", "^:%s*=%s*" }, icon = "", lang = "lua" },
help = { pattern = "^:%s*he?l?p?%s+", icon = "" },
},
},
},
Expand Down
37 changes: 18 additions & 19 deletions .config/nvim/lua/plugins/nvim-cmp.lua
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,10 @@ local M = {
"petertriho/cmp-git",
"ray-x/cmp-treesitter",
"saadparwaiz1/cmp_luasnip",
"tzachar/cmp-tabnine",
"uga-rosa/cmp-dictionary",
"yutkat/cmp-mocword",
"zbirenbaum/copilot-cmp",
"tzachar/cmp-tabnine",
"onsails/lspkind-nvim",
},

---@class cmp.Config
Expand All @@ -48,30 +47,30 @@ local M = {
format = lspkind.cmp_format({
mode = "symbol_text",
symbol_map = {
Text = "󿞃",
Method = "󿚦",
Function = "󿞔",
Text = "󰉿",
Method = "󰆧",
Function = "󰊕",
Constructor = "",
Field = "󿰠",
Variable = "󿔪",
Class = "",
Field = "󰜢",
Variable = "󰀫",
Class = "󰠱",
Interface = "",
Module = "",
Property = "󿰠",
Unit = "󿥬",
Value = "󿢟",
Property = "󰜢",
Unit = "󰑭",
Value = "󰎠",
Enum = "",
Keyword = "󿠊",
Keyword = "󰌋",
Snippet = "",
Color = "󿣗",
File = "󿜘",
Reference = "󿜆",
Folder = "󿝊",
Color = "󰏘",
File = "󰈙",
Reference = "󰈇",
Folder = "󰉋",
EnumMember = "",
Constant = "󿣾",
Struct = "󿭄",
Constant = "󰏿",
Struct = "󰙅",
Event = "",
Operator = "󿚔",
Operator = "󰆕",
TypeParameter = "",
},
maxwidth = 50,
Expand Down
7 changes: 0 additions & 7 deletions .config/nvim/lua/plugins/nvim-notify.lua
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,5 @@ return {
max_width = function()
return math.floor(vim.o.columns * 0.75)
end,
icons = {
ERROR = "",
WARN = "",
INFO = "",
DEBUG = "",
TRACE = "✎",
},
},
}
28 changes: 1 addition & 27 deletions .config/nvim/lua/plugins/nvim-web-devicons.lua
Original file line number Diff line number Diff line change
@@ -1,31 +1,5 @@
return {
"nvim-tree/nvim-web-devicons",
event = "VimEnter",
-- opts = {
-- override = {
-- ts = {
-- icon = "ﯤ ",
-- color = "#3178C6",
-- },
-- },
config = function()
local devicons = require("nvim-web-devicons")

local override = {
default_icon = {
icon = " ",
color = "#6d8086",
cterm_color = "66",
name = "Default",
},
}
for name, data in pairs(devicons.get_icons()) do
local icon = data.icon
local pad = vim.api.nvim_strwidth(icon) == 1 and " " or ""

override[name] = vim.tbl_extend("force", data, { icon = icon .. pad })
end

devicons.setup({ override = override })
end,
opts = true,
}
2 changes: 1 addition & 1 deletion .config/nvim/lua/plugins/sidebar.lua
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ local M = {
interval = 5000,
},
datetime = {
icon = "󿙏",
icon = "󰃰",
format = "%a %b %d, %H:%M",
clocks = {
{ name = "local" }
Expand Down
14 changes: 7 additions & 7 deletions .config/nvim/lua/plugins/todo-comments.lua
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@ return {
-- keywords recognized as todo comments
keywords = {
FIX = {
icon = "", -- icon used for the sign, and in search results
color = "error", -- can be a hex color, or a named color (see below)
icon = " ", -- icon used for the sign, and in search results
color = "error", -- can be a hex color, or a named color (see below)
alt = { "FIXME", "BUG", "FIXIT", "ISSUE" }, -- a set of other keywords that all map to this FIX keywords
-- signs = false, -- configure signs for some keywords individually
},
TODO = { icon = "", color = "info" },
HACK = { icon = "", color = "warning" },
WARN = { icon = "", color = "warning", alt = { "WARNING", "XXX" } },
PERF = { icon = " ", alt = { "OPTIM", "PERFORMANCE", "OPTIMIZE" } },
NOTE = { icon = " ", color = "hint", alt = { "INFO" } },
TODO = { icon = " ", color = "info" },
HACK = { icon = " ", color = "warning" },
WARN = { icon = "", color = "warning", alt = { "WARNING", "XXX" } },
PERF = { icon = " ", alt = { "OPTIM", "PERFORMANCE", "OPTIMIZE" } },
NOTE = { icon = " ", color = "hint", alt = { "INFO" } },
TEST = { icon = "⏲ ", color = "test", alt = { "TESTING", "PASSED", "FAILED" } },
},
gui_style = {
Expand Down
2 changes: 1 addition & 1 deletion .config/silicon/config
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
--theme tokyonight_moon
--font Cica
--font UDEV Gothic 35NFLG
--no-line-number
5 changes: 1 addition & 4 deletions .config/wezterm/wezterm.lua
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@ require("on")
config.cell_width = 0.9
config.color_scheme = "tokyonight_moon"
config.default_prog = { "/opt/homebrew/bin/fish", "-l" }
config.font = wezterm.font_with_fallback({
{ family = "Cica" },
{ family = "Cica", assume_emoji_presentation = true },
})
config.font = wezterm.font("UDEV Gothic 35NFLG")
config.font_size = 14
config.hide_tab_bar_if_only_one_tab = true
config.line_height = 1.2
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
- Shell: [fish](https://github.com/fish-shell/fish-shell)
- Editor: [Neovim](https://github.com/neovim/neovim)
- Terminal: [WezTerm](https://github.com/wez/wezterm)
- Font: [Cica](https://github.com/miiton/Cica)
- Font: [UDEV Gothic](https://github.com/yuru7/udev-gothic)
- Runtime Version Manager: [rtx](https://github.com/jdx/rtx)
- Package Manager: [Homebrew](https://github.com/Homebrew/brew)

Expand Down
Loading