edgy

lazy-lock.json

@@ -21,7 +21,7 @@
   "edgy.nvim": { "branch": "main", "commit": "ebb77fde6f5cb2745431c6c0fe57024f66471728" },
   "fidget.nvim": { "branch": "main", "commit": "d855eed8a06531a7e8fd0684889b2943f373c469" },
   "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" },
-  "fzf-lua": { "branch": "main", "commit": "02379a936c28949ffc53f5d971193d3a2277921c" },
+  "fzf-lua": { "branch": "main", "commit": "0c7cd0169cb8433f4f3b102bf6d4c0c7e0a20446" },
   "gitsigns.nvim": { "branch": "main", "commit": "f074844b60f9e151970fbcdbeb8a2cd52b6ef25a" },
   "image.nvim": { "branch": "master", "commit": "61c76515cfc3cdac8123ece9e9761b20c3dc1315" },
   "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" },
@@ -59,5 +59,6 @@
   "typst.vim": { "branch": "main", "commit": "4d18ced62599ffe5b3c0e5e49566d5456121bc02" },
   "vim-lastplace": { "branch": "master", "commit": "e58cb0df716d3c88605ae49db5c4741db8b48aa9" },
   "vim-tmux-navigator": { "branch": "master", "commit": "5b3c701686fb4e6629c100ed32e827edf8dad01e" },
-  "which-key.nvim": { "branch": "main", "commit": "6c1584eb76b55629702716995cca4ae2798a9cca" }
+  "which-key.nvim": { "branch": "main", "commit": "6c1584eb76b55629702716995cca4ae2798a9cca" },
+  "winbar.nvim": { "branch": "main", "commit": "13739fdb31be51a1000486189662596f07a59a31" }
 }

lua/config/mappings.lua

@@ -74,7 +74,7 @@ wk.add({
 			function()
 				vim.lsp.buf.rename()
 			end,
-      desc = "Rename symbol",
+			desc = "Rename symbol",
 		},
 
 		{
@@ -111,7 +111,8 @@ wk.add({
 			"<C-n>",
 			function()
 				-- ToggleTree("filesystem")
-				require("edgy").toggle("left")
+				-- require("edgy").toggle("left")
+				require("edgy-group").open_group_offset("left", 1)
 			end,
 			desc = "Toggle left panel",
 		},

lua/plugins/bar.lua

@@ -3,6 +3,17 @@ return {
 	version = "*",
 	dependencies = "nvim-tree/nvim-web-devicons",
 	opts = function()
+		require("bufferline").setup({
+			options = {
+				custom_areas = {
+					left = function()
+						return vim.tbl_map(function(item)
+							return { text = item }
+						end, require("edgy-group.stl").get_statusline("left"))
+					end,
+				},
+			},
+		})
 		local Offset = require("bufferline.offset")
 		if not Offset.edgy then
 			local get = Offset.get
@@ -13,7 +24,8 @@ return {
 					for _, pos in ipairs({ "left", "right" }) do
 						local sb = layout[pos]
 						if sb and #sb.wins > 0 then
-							local title = " Sidebar" .. string.rep(" ", sb.bounds.width - 8)
+							-- local title = " Sidebar" .. string.rep(" ", sb.bounds.width - 8)
+							local title = string.rep(" ", sb.bounds.width)
 							ret[pos] = "%#EdgyTitle#" .. title .. "%*" .. "%#WinSeparator#│%*"
 							ret[pos .. "_size"] = sb.bounds.width
 						end

lua/plugins/edgy.lua

@@ -30,16 +30,16 @@ return {
 		opts = {
 			groups = {
 				left = {
-					{ icon = "", titles = { "Neo-Tree", "Neo-Tree Buffers" } },
-					{ icon = "", titles = { "Neo-Tree Git" } },
-					{ icon = "", titles = { "Outline" } },
+					{ icon = "", titles = { "Files", "Git" } },
+					-- { icon = "", titles = { "Git" } },
+					-- { icon = "", titles = { "Outline" } },
 				},
 			},
 			statusline = {
         -- suffix and prefix separators between icons
         separators = { ' ', ' ' },
         clickable = false, -- open group on click
-        colored = false, -- enable highlight support
+        colored = true, -- enable highlight support
         colors = { -- highlight colors
           active = 'Normal', -- highlight color for open group
           inactive = 'Normal', -- highlight color for closed group
@@ -96,7 +96,7 @@ return {
 			},
 			left = {
 				{
-					title = "Neo-Tree",
+					title = "Files",
 					ft = "neo-tree",
 					filter = function(buf)
 						return vim.b[buf].neo_tree_source == "filesystem"
@@ -105,7 +105,7 @@ return {
 					open = "Neotree position=left filesystem",
 				},
 				{
-					title = "Neo-Tree Buffers",
+					title = "Buffers",
 					ft = "neo-tree",
 					filter = function(buf)
 						return vim.b[buf].neo_tree_source == "buffers"
@@ -113,13 +113,15 @@ return {
 					open = "Neotree position=top buffers",
 				},
 				{
-					title = "Neo-Tree Git",
+					title = "Git",
 					ft = "neo-tree",
 					filter = function(buf)
 						return vim.b[buf].neo_tree_source == "git_status"
 					end,
 					open = "Neotree position=right git_status",
 				},
+      },
+      right = {
 				{
 					ft = "Outline",
 					open = "SymbolsOutlineOpen",
@@ -209,7 +211,7 @@ return {
 				-- Setting to `true`, will add an edgy winbar.
 				-- Setting to `false`, won't set any winbar.
 				-- Setting to a string, will set the winbar to that string.
-				winbar = true,
+				winbar = false,
 				winfixwidth = true,
 				winfixheight = false,
 				winhighlight = "WinBar:EdgyWinBar,Normal:EdgyNormal",