feat(ui): unified #718

vollowx · 2023-05-06T11:11:09Z

Similar appearances for cmp and wilder.
Tidy appearance for bufferline working with nvim-tree and outline (lspsaga).
Colored indent-blankline.
Similar appearances for indent lines in nvim-tree, indent-blankline and outline (lspsaga).
New styles for float windows including Telescope.
Enabled highlights for ts-context, and its mode changed to topline.
Highlight names for alpha changed to the default.

Showcase

Telescope

Bufferline and treesitter-context

cmp and wilder

ayamir · 2023-05-07T03:10:12Z

Acceptable, need to be merged before 3.0.0 released.

vollowx · 2023-05-07T03:22:55Z

Cmp document highlights and cmp menu format updated.

Saafo · 2023-05-07T05:05:02Z

Acceptable, need to be merged before 3.0.0 released.

Seems 3.0 didn't include this pr😢

Any new plans?

ayamir · 2023-05-07T05:24:49Z

forgot to call for @Jint-lzxy ...

But after all it is a draft and need more time to discuss, modify and get merged finally.

vollowx · 2023-05-07T06:00:17Z

There's a new style for lualine but I'm not sure it's mostly acceptable.

Tell me if you like this.

(lspsaga outline removed)

CharlesChiuGit · 2023-05-07T06:09:37Z

There's a new style for lualine but I'm not sure it's mostly acceptable.

Tell me if you think it's acceptable.

(lspsaga outline removed)

I like this one, but I'm thinking we can add git-blames in the middle of it?

vollowx · 2023-05-07T06:26:49Z

There's a new style for lualine but I'm not sure it's mostly acceptable.

Tell me if you think it's acceptable.
(lspsaga outline removed)

I like this one, but I'm thinking we can add git-blames in the middle of it?

Not sure about this, gitsigns already provides git blame at the end of current line.

CharlesChiuGit · 2023-05-07T07:12:15Z

i knw, i just don't like that lol
it's pretty annoying to me.
but it's not my repo, so it's not my call.

Jint-lzxy · 2023-05-07T08:52:01Z

There's a new style for lualine but I'm not sure it's mostly acceptable.

Tell me if you like this.

(lspsaga outline removed)

Sorry for the delay, I'm also working on this 🤦‍♂️

Several thoughts:

Perhaps lualine_y and lualine_z should be kept the same as before? Since they provide important information about document metadata & current cursor location;

Loving the reimplementation of lualine_a/b/c, but would it be a bit repetitive to display filename at three different positions (bufferline, lspsaga, lualine)? Maybe we could replace that with show_cwd, but if so, we should support Windows:

nvimdots/lua/modules/configs/ui/lualine.lua

Lines 52 to 54 in 56538b7

    
           local is_windows = require("core.global").is_windows 
        
           if not is_windows then 
        
           	local home = require("core.global").home

In terms of file status, I prefer to use glyphs to represent that (instead of occupying lualine_b):

local function is_new_file()
	local filename = vim.fn.expand("%")
	return filename ~= "" and vim.bo.buftype == "" and vim.fn.filereadable(filename) == 0
end
local edit_status = {
	function()
		if vim.bo.modified then
			return icons.lualine.Modified
		elseif not vim.bo.modifiable or vim.bo.readonly then
			return icons.lualine.ReadOnly
		elseif is_new_file() then
			return icons.lualine.NewFile
		else
			return icons.lualine.Normal
		end
	end,
	color = function()
		return {
			fg = vim.bo.modified and colors.green
				or ((not vim.bo.modifiable or vim.bo.readonly) and colors.red or colors.lavender),
			bg = colors.surface0,
		}
	end,
	padding = { left = 1.2, right = 1.3 },
}

Jint-lzxy · 2023-05-07T09:03:59Z

I like this one, but I'm thinking we can add git-blames in the middle of it?

@CharlesChiuGit Great idea, but now lualine-c is occupied by git_status. Would adding git_blame result in lualine-c being overcrowded?

ayamir · 2023-05-07T09:05:32Z

So should we keep lspsaga winbar symbols showed in lualine? Becase more visual elements are added, and the region of lualine_c will be fully occupied when in a deep embeded position. So the whole lualine looks bloated and can't show the complete lspsaga winbar symbols. Maybe let it just in the winbar will better.

Jint-lzxy · 2023-05-07T09:11:08Z

@ayamir I've removed that: #718 (comment). But as a smaller matter, shall we enable symbol_in_winbar.show_file? Otherwise Winbar will be empty when there're no symbols to show (e.g., at init.lua).

Side effect: It will repeat with bufferline.

ayamir · 2023-05-07T09:19:47Z

@ayamir I've removed that: #718 (comment). But as a smaller matter, shall we enable symbol_in_winbar.show_file? Otherwise Winbar will be empty when there're no symbols to show (e.g., at init.lua).

Side effect: It will repeat with bufferline.

I prefer to show_file = false.

CharlesChiuGit · 2023-05-07T09:22:47Z

@CharlesChiuGit Great idea, but now lualine-c is occupied by git_status. Would adding git_blame result in lualine-c being overcrowded?

Ys, if the commit is super long then is well be overcrowded.

So should we keep lspsaga winbar symbols showed in lualine? Becase more visual elements are added, and the region of lualine_c will be fully occupied when in a deep embeded position. So the whole lualine looks bloated and can't show the complete lspsaga winbar symbols. Maybe let it just in the winbar will better.

Root for taking winbar back.

I've removed that: #718 (comment). But as a smaller matter, shall we enable symbol_in_winbar.show_file? Otherwise Winbar will be empty when there're no symbols to show (e.g., at init.lua).

Side effect: It will repeat with bufferline.

Personally I think it's fine to disable symbol_in_winbar.show_file.
In terms of user experience, we still need to wait for lsp to give us the diagnostics for few seconds sometimes. So I think it's okay to let the winbar to jitter the window a bit.

vollowx · 2023-05-07T09:26:33Z

* I'm only free at Chinese weekends, the following 5 days I can't do anything...

CharlesChiuGit · 2023-05-07T09:30:33Z

I'm only free at Chinese weekends, the following 5 days I can't do anything...

It's okay lol. We all are, well, in a certain level.

CharlesChiuGit · 2023-05-07T09:38:16Z

I like the gray-out effect on the git diffs and the smaller gaps between diagnostics.

Other parts I like @Jint-lzxy 's version more.

Not being offensive, just from a pure personal aesthetic perspective.

Jint-lzxy · 2023-05-07T09:41:39Z

I like the gray-out effect on the git diffs and the smaller gaps between diagnostics.

Also loving the reimplementation of lualine_a/b/c 😄 I'll merge these two versions into one.

ayamir · 2023-05-07T15:01:15Z

I'd like @Jint-lzxy left part and @huge-pancake right part combined personally.

Merge from origin

vollowx · 2023-05-12T14:10:34Z

I'm back! Should we merge it soon or we wait for the new lualine config completely done?

My current lualine config

return function()
	local icons = {
		diagnostics = require("modules.utils.icons").get("diagnostics", true),
		misc = require("modules.utils.icons").get("misc", true),
		git = require("modules.utils.icons").get("git", true),
		ui = require("modules.utils.icons").get("ui", true),
	}

	local function diff_source()
		local gitsigns = vim.b.gitsigns_status_dict
		if gitsigns then
			return {
				added = gitsigns.added,
				modified = gitsigns.changed,
				removed = gitsigns.removed,
			}
		end
	end

	local function lsp_status()
		if rawget(vim, "lsp") then
			for _, client in ipairs(vim.lsp.get_active_clients()) do
				if client.attached_buffers[vim.api.nvim_get_current_buf()] and client.name ~= "null-ls" then
					return (vim.o.columns > 100 and "%#St_LspStatus#" .. " LSP [" .. client.name .. "]") or " LSP"
				end
			end
		end
	end

	local function get_cwd()
		local cwd = vim.fn.getcwd()
		local is_windows = require("core.global").is_windows
		if not is_windows then
			local home = require("core.global").home
			if cwd:find(home, 1, true) == 1 then
				cwd = "~" .. cwd:sub(#home + 1)
			end
		end
		return icons.ui.RootFolderOpened .. cwd
	end

	local mini_sections = {
		lualine_a = { "filetype" },
		lualine_b = {},
		lualine_c = {},
		lualine_x = {},
		lualine_y = {},
		lualine_z = {},
	}
	local outline = {
		sections = mini_sections,
		filetypes = { "lspsagaoutline" },
	}
	local diffview = {
		sections = mini_sections,
		filetypes = { "DiffviewFiles" },
	}

	local function python_venv()
		local function env_cleanup(venv)
			if string.find(venv, "/") then
				local final_venv = venv
				for w in venv:gmatch("([^/]+)") do
					final_venv = w
				end
				venv = final_venv
			end
			return venv
		end

		if vim.bo.filetype == "python" then
			local venv = os.getenv("CONDA_DEFAULT_ENV")
			if venv then
				return string.format("%s", env_cleanup(venv))
			end
			venv = os.getenv("VIRTUAL_ENV")
			if venv then
				return string.format("%s", env_cleanup(venv))
			end
		end
		return ""
	end

	local colors = require("modules.utils").get_palette()
	local custom_catppuccin = require("lualine.themes.catppuccin")
	custom_catppuccin.normal.c.fg = colors.overlay0

	require("lualine").setup({
		options = {
			icons_enabled = true,
			theme = custom_catppuccin,
			disabled_filetypes = {},
			component_separators = "",
			section_separators = { left = "", right = "" },
		},
		sections = {
			lualine_a = {
				{
					"mode",
					fmt = function(name)
						return icons.misc.Vim .. name
					end,
				},
			},
			lualine_b = {
				{ "filetype", colored = false, icon_only = true, padding = { left = 1 } },
				{ "filename" },
			},
			lualine_c = {
				{ "branch", icon = string.sub(icons.git.Branch, 1, 4), padding = { left = 1 } },
				{
					"diff",
					colored = false,
					symbols = {
						added = icons.git.Add,
						modified = icons.git.Mod,
						removed = icons.git.Remove,
					},
					source = diff_source,
				},
				-- This can make things after this in section c centered
				-- function()
				-- 	return "%="
				-- end,
			},
			lualine_x = {
				{
					"diagnostics",
					sources = { "nvim_diagnostic" },
					sections = { "error", "warn", "info", "hint" },
					symbols = {
						error = icons.diagnostics.Error,
						warn = icons.diagnostics.Warning,
						info = icons.diagnostics.Information,
						hint = icons.diagnostics.Hint,
					},
				},
				lsp_status,
			},
			lualine_y = {
				get_cwd,
				python_venv,
			},
			lualine_z = { "location" },
		},
		inactive_sections = {
			lualine_a = {},
			lualine_b = {},
			lualine_c = { "filename" },
			lualine_x = { "location" },
			lualine_y = {},
			lualine_z = {},
		},
		tabline = {},
		extensions = {
			"quickfix",
			"nvim-tree",
			"nvim-dap-ui",
			"toggleterm",
			"fugitive",
			outline,
			diffview,
		},
	})
end

vollowx · 2023-05-12T14:21:35Z

Also IMO the similar things should be in one place, for example, filename, filetype (icon) and file format should be in same place but not place the filename on the left and others on the right. @Jint-lzxy

CharlesChiuGit · 2023-05-12T17:28:14Z

Should we merge it soon or we wait for the new lualine config completely done?

i prefer merge when things r settled

CharlesChiuGit · 2023-05-12T17:30:59Z

Also IMO the similar things should be in one place, for example, filename, filetype (icon) and file format should be in same place but not place the filename on the left and others on the right. @Jint-lzxy

seems like a gd idea

Jint-lzxy · 2023-05-13T06:31:03Z

Also IMO the similar things should be in one place, for example, filename, filetype (icon) and file format should be in same place but not place the filename on the left and others on the right.

Agreed. (#718 (comment))

Should we merge it soon or we wait for the new lualine config completely done?

We need to wait until the upstream PR catppuccin/nvim#481 gets merged. It will introduce many changes.

ayamir · 2023-05-20T02:53:32Z

Can't wait to merge it

Jint-lzxy · 2023-05-29T12:00:03Z

IMHO we can first merge the commits that won't change their states due to upstream changes (such as cmp, wilder).

vollowx · 2023-06-02T18:34:51Z

IMHO we can first merge the commits that won't change their states due to upstream changes (such as cmp, wilder).

Sure

vollowx · 2023-06-03T17:13:28Z

New style for nvim-tree.

Customized nvim-web-devicons.

vollowx · 2023-06-10T16:08:44Z

The other customization will be divided in some other prs, unsure new styles will be discussed at #698.

feat(ui): unified

c2be193

vollowx marked this pull request as draft May 6, 2023 11:11

vollowx mentioned this pull request May 6, 2023

Tidy and unified UI #698

Closed

feat(cmp): update cmp doc highlights and menu format

2c469f2

fix(catppuccin): fix highlights for transparent_background

c90f1aa

fix(lspsaga): add Normal and Border highlights

c6a9676

huge-pancake and others added 2 commits May 12, 2023 22:06

fix(git): resolve conflict

4c98551

Merge pull request #2 from ayamir/main

94af030

Merge from origin

feat(nvim-tree): update git appearance

c649f9c

fix(bufferline): remove indicator

cfcdefe

huge-pancake added 2 commits May 13, 2023 08:35

fix(cmp): no max width

6a7033a

fix(cmp): more padding between kind parts

6b5403f

Jint-lzxy mentioned this pull request May 29, 2023

feat(ui)!: unify UI components: cmp, wilder, floats #772

Merged

vollowx closed this Jun 10, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(ui): unified #718

feat(ui): unified #718

vollowx commented May 6, 2023 •

edited

Loading

ayamir commented May 7, 2023

vollowx commented May 7, 2023 •

edited

Loading

Saafo commented May 7, 2023 •

edited

Loading

ayamir commented May 7, 2023 •

edited

Loading

vollowx commented May 7, 2023 •

edited

Loading

CharlesChiuGit commented May 7, 2023 •

edited

Loading

vollowx commented May 7, 2023

CharlesChiuGit commented May 7, 2023

Jint-lzxy commented May 7, 2023

Jint-lzxy commented May 7, 2023

ayamir commented May 7, 2023

Jint-lzxy commented May 7, 2023

ayamir commented May 7, 2023

CharlesChiuGit commented May 7, 2023 •

edited

Loading

vollowx commented May 7, 2023 •

edited

Loading

CharlesChiuGit commented May 7, 2023

CharlesChiuGit commented May 7, 2023

Jint-lzxy commented May 7, 2023

ayamir commented May 7, 2023

vollowx commented May 12, 2023

vollowx commented May 12, 2023 •

edited

Loading

CharlesChiuGit commented May 12, 2023

CharlesChiuGit commented May 12, 2023

Jint-lzxy commented May 13, 2023

ayamir commented May 20, 2023

Jint-lzxy commented May 29, 2023

vollowx commented Jun 2, 2023

vollowx commented Jun 3, 2023 •

edited

Loading

vollowx commented Jun 10, 2023

feat(ui): unified #718

feat(ui): unified #718

Conversation

vollowx commented May 6, 2023 • edited Loading

ayamir commented May 7, 2023

vollowx commented May 7, 2023 • edited Loading

Saafo commented May 7, 2023 • edited Loading

ayamir commented May 7, 2023 • edited Loading

vollowx commented May 7, 2023 • edited Loading

CharlesChiuGit commented May 7, 2023 • edited Loading

vollowx commented May 7, 2023

CharlesChiuGit commented May 7, 2023

Jint-lzxy commented May 7, 2023

Jint-lzxy commented May 7, 2023

ayamir commented May 7, 2023

Jint-lzxy commented May 7, 2023

ayamir commented May 7, 2023

CharlesChiuGit commented May 7, 2023 • edited Loading

vollowx commented May 7, 2023 • edited Loading

CharlesChiuGit commented May 7, 2023

CharlesChiuGit commented May 7, 2023

Jint-lzxy commented May 7, 2023

ayamir commented May 7, 2023

vollowx commented May 12, 2023

vollowx commented May 12, 2023 • edited Loading

CharlesChiuGit commented May 12, 2023

CharlesChiuGit commented May 12, 2023

Jint-lzxy commented May 13, 2023

ayamir commented May 20, 2023

Jint-lzxy commented May 29, 2023

vollowx commented Jun 2, 2023

vollowx commented Jun 3, 2023 • edited Loading

vollowx commented Jun 10, 2023

vollowx commented May 6, 2023 •

edited

Loading

vollowx commented May 7, 2023 •

edited

Loading

Saafo commented May 7, 2023 •

edited

Loading

ayamir commented May 7, 2023 •

edited

Loading

vollowx commented May 7, 2023 •

edited

Loading

CharlesChiuGit commented May 7, 2023 •

edited

Loading

CharlesChiuGit commented May 7, 2023 •

edited

Loading

vollowx commented May 7, 2023 •

edited

Loading

vollowx commented May 12, 2023 •

edited

Loading

vollowx commented Jun 3, 2023 •

edited

Loading