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.

Sign up for GitHub

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

feat(ui)!: unify other UI components #833

Merged
merged 6 commits into from
Jul 2, 2023
Merged

feat(ui)!: unify other UI components #833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e7970a9
feat(ui)!: unify UI component `lualine`
Jun 30, 2023
cc9ab7d
fixup! feat(ui)!: unify UI component `lualine`
Jint-lzxy Jul 1, 2023
bdf0784
fix ci
Jint-lzxy Jul 1, 2023
730e07d
fix autocmd registration
Jint-lzxy Jul 1, 2023
3684385
cleanups
Jint-lzxy Jul 1, 2023
204e4c0
chore: make function names more intuitive
Jint-lzxy Jul 1, 2023
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
2 changes: 1 addition & 1 deletion lua/core/options.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ local function load_options()
breakat = [[\ \ ;:,!?]],
breakindentopt = "shift:2,min:20",
clipboard = "unnamedplus",
cmdheight = 2, -- 0, 1, 2
cmdheight = 1, -- 0, 1, 2
cmdwinheight = 5,
complete = ".,w,b,k",
completeopt = "menuone,noselect",
Expand Down
2 changes: 1 addition & 1 deletion lua/modules/configs/completion/formatting.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ end, { nargs = 1, complete = "filetype" })

function M.enable_format_on_save(is_configured)
local opts = { pattern = "*", timeout = 1000 }
vim.api.nvim_create_augroup("format_on_save", {})
vim.api.nvim_create_augroup("format_on_save", { clear = true })
vim.api.nvim_create_autocmd("BufWritePre", {
group = "format_on_save",
pattern = opts.pattern,
Expand Down
2 changes: 1 addition & 1 deletion lua/modules/configs/completion/lspsaga.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ return function()
},
},
symbol_in_winbar = {
enable = false,
enable = true,
separator = " " .. icons.ui.Separator,
hide_keyword = true,
show_file = false,
Expand Down
6 changes: 3 additions & 3 deletions lua/modules/configs/ui/bufferline.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ return function()
buffer_close_icon = icons.ui.Close,
left_trunc_marker = icons.ui.Left,
right_trunc_marker = icons.ui.Right,
max_name_length = 14,
max_name_length = 20,
max_prefix_length = 13,
tab_size = 20,
color_icons = true,
Expand All @@ -29,13 +29,13 @@ return function()
filetype = "NvimTree",
text = "File Explorer",
text_align = "center",
padding = 1,
padding = 0,
},
{
filetype = "lspsagaoutline",
text = "Lspsaga Outline",
text_align = "center",
padding = 1,
padding = 0,
},
},
},
Expand Down
9 changes: 8 additions & 1 deletion lua/modules/configs/ui/catppuccin.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,13 @@ return function()
bg = transparent_background and cp.none or cp.mantle,
},

-- For lspsaga.nvim
OutlineNormal = { bg = transparent_background and cp.none or cp.mantle },
OutlineWinSeparator = {
bg = transparent_background and cp.none or cp.base,
fg = transparent_background and cp.surface1 or cp.base,
},

-- For fidget
FidgetTask = { bg = cp.none, fg = cp.surface2 },
FidgetTitle = { fg = cp.blue, style = { "bold" } },
Expand Down Expand Up @@ -172,7 +179,7 @@ return function()
bg = transparent_background and cp.none or cp.mantle,
},
TelescopeSelection = {
fg = cp.green,
fg = transparent_background and cp.subtext0 or cp.text,
bg = transparent_background and cp.none or cp.surface0,
},
TelescopeResultsDiffAdd = { fg = cp.green },
Expand Down
Loading