lua/keymap.lua

@@ -52,9 +52,6 @@ return {
     },
     {
         { 'n' }, '<C-w><Right>', '<cmd>wincmd l<CR>', { desc = "Window Right" }
-    },
-    {
-        { 'n', 'i' }, '<C-b>', '<cmd>Neotree toggle<CR>', { desc = "Toggle Neotree" }
     }
 }
 

lua/plugins/cokeline.lua

@@ -148,13 +148,13 @@ return {
                         end,
                         bg = function(tabpage)
                             if tabpage.is_active then
-                                return "lualine_a_command"
+                                return "NeoTreeTabActive"
                             end
                             return "NeoTreeTabInactive"
                         end,
                         fg = function(tabpage)
                             if tabpage.is_active then
-                                return "lualine_a_command"
+                                return "NeoTreeTabActive"
                             end
                             return "NeoTreeTabInactive"
                         end
@@ -170,24 +170,17 @@ return {
                             tabpage:close()
                         end,
                         bg = function(_)
-                            return "lualine_a_command"
+                            return "NeoTreeTabActive"
                         end,
                         fg = function(_)
-                            return "lualine_a_command"
+                            return "NeoTreeTabActive"
                         end
                     }
                 },
             },
             rhs = {
                 {
-                    text = " ➕TAB ",
-                    on_click = function(_, _, _, _, _)
-                        vim.defer_fn(function()
-                            vim.cmd("tabnew")
-                        end, 100)
-                    end,
-                    fg = "NeoTreeTabActive",
-                    bg = "NeoTreeTabActive"
+                    text = "󰓩  2 tabs"
                 }
             },
             sidebar = {

lua/plugins/illuminate.lua

@@ -1,10 +0,0 @@
-return {
-    {
-        "RRethy/vim-illuminate",
-        config = function (_, _)
-            require('illuminate').configure({
-                
-            })
-        end
-    }
-}

lua/plugins/lualine.lua

@@ -52,27 +52,10 @@ return {
                             added = '+',
                             modified = '~',
                             removed = '-',
-                        },
-                        on_click = function ()
-                            vim.defer_fn(function()
-                                vim.cmd("Gitsigns diffthis")
-                            end, 100)
-                        end,
+                        }
                     },
                 },
                 lualine_x = {
-                    {
-                        function ()
-                            local client_id = vim.lsp.get_client_by_id(1)
-                            return '  LSP ~ ' .. client_id.name
-                        end,
-                        on_click = function ()
-                            vim.defer_fn(function()
-                                vim.cmd("LspInfo")
-                            end, 100)
-                        end,
-                        color = 'lualine_c_inactive'
-                    },
                     {
                         'diagnostics',
                         symbols = {
@@ -84,13 +67,21 @@ return {
                         sources = {
                             'nvim_diagnostic'
                         },
-                        update_in_insert = true,
+                        update_in_insert = true
+                    },
+                    {
+                        function ()
+                            local client_id = vim.lsp.get_client_by_id(1)
+                            return '  LSP - ' .. client_id.name
+                        end,
                         on_click = function ()
                             vim.defer_fn(function()
-                                vim.cmd("TroubleToggle")
+                                vim.cmd("LspInfo")
                             end, 100)
-                        end,
+                        end
                     },
+                    'encoding',
+                    'fileformat',
                     {
                         'filetype',
                         colored = true,
@@ -99,13 +90,9 @@ return {
                                 vim.cmd("Telescope filetypes")
                             end, 100)
                         end
-                    },
-                    'encoding',
-                    'fileformat'
-                },
-                lualine_y = {
-                    { 'progress' }
+                    }
                 },
+                lualine_y = {'progress'},
                 lualine_z = {'location'}
             },
             inactive_sections = {

lua/plugins/neotree.lua

@@ -11,6 +11,16 @@ return {
             local options = require("options")
 
             return {
+                sources = {
+                    "filesystem",
+                    "buffers",
+                    "git_status",
+                    "document_symbols"
+                },
+                source_selector = {
+                    winbar = true,
+                    statusline = false
+                },
                 close_if_last_window = true,
                 popup_border_style = options.ui.border,
                 default_component_configs = {

lua/plugins/statuscol.lua

@@ -15,10 +15,10 @@ return {
                     {
                         sign = {
                             name = { "Diagnostic" },
-                            colwidth = 2,
-                            maxwidth = 1
+                            colwidth = 1,
+                            maxwidth = 1,
+                            condition = { true }
                         },
-                        auto = true,
                         click = "v:lua.ScSa"
                     },
                     -- line numbers