From 416ac23572ea7edebafd2ea88384831bbd70d2b2 Mon Sep 17 00:00:00 2001
From: c-my <cmy1113@outlook.com>
Date: Thu, 27 Apr 2023 16:32:48 +0800
Subject: [PATCH] lualine: add lazy extension

---
 lazy-lock.json          |  12 ++---
 lua/configs/lazy.lua    |   6 ---
 lua/configs/options.lua |   9 ++--
 lua/plugins/lualine.lua | 108 +++++++++++++++++++++-------------------
 4 files changed, 69 insertions(+), 66 deletions(-)

diff --git a/lazy-lock.json b/lazy-lock.json
index 2fd14a4..1ad937e 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -13,14 +13,14 @@
   "indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" },
   "lazy.nvim": { "branch": "main", "commit": "903f0fe542fc35b74f3c09494f9c175346dfa76d" },
   "lualine.nvim": { "branch": "master", "commit": "84ffb80e452d95e2c46fa29a98ea11a240f7843e" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "22d17951315e22e602912c9629b97d183fb90d16" },
-  "mason.nvim": { "branch": "main", "commit": "9a68a4bd997b72cee4132459e0fd99eea0cdc627" },
-  "null-ls.nvim": { "branch": "main", "commit": "63e1ab06f362c7fcd8a1b6f95665b55814190986" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "a430dd7696f9cf9423ac3d902a049fa315d8d296" },
+  "mason.nvim": { "branch": "main", "commit": "253961cfe9b0a63b2524088be294acd7522366e5" },
+  "null-ls.nvim": { "branch": "main", "commit": "33b853a3933eed3137cd055aac4e539e69832ad0" },
   "nvim-autopairs": { "branch": "master", "commit": "7566a86f44bb72ba2b1a609f528a27d93241502d" },
-  "nvim-cmp": { "branch": "main", "commit": "e28fb7a730b1bd425fdddfdbd3d36bb84bd77611" },
-  "nvim-lspconfig": { "branch": "master", "commit": "710c45bd13928c1f37ef0a714fd49b75f00d7d5e" },
+  "nvim-cmp": { "branch": "main", "commit": "11102d3db12c7f8b35265ad0e17a21511e5b1e68" },
+  "nvim-lspconfig": { "branch": "master", "commit": "427378a03ffc1e1bc023275583a49b1993e524d0" },
   "nvim-tree.lua": { "branch": "master", "commit": "bb375fb20327c49920c41d2b51c1ce2f4fe7deb3" },
-  "nvim-treesitter": { "branch": "master", "commit": "0d7da3bd7d59ffacc2fac6a52a1ba16d820f882c" },
+  "nvim-treesitter": { "branch": "master", "commit": "08e8b2c08bfdcd20e4561620ca0ccda0bb2e050a" },
   "nvim-web-devicons": { "branch": "master", "commit": "4ec26d67d419c12a4abaea02f1b6c57b40c08d7e" },
   "plenary.nvim": { "branch": "master", "commit": "9ac3e9541bbabd9d73663d757e4fe48a675bb054" },
   "symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" },
diff --git a/lua/configs/lazy.lua b/lua/configs/lazy.lua
index 78b2387..dee7b1c 100644
--- a/lua/configs/lazy.lua
+++ b/lua/configs/lazy.lua
@@ -12,12 +12,6 @@ end
 vim.opt.rtp:prepend(lazypath)
 
 require("lazy").setup("plugins")
--- {
---     "jose-elias-alvarez/null-ls.nvim",
---     config = function()
---         require("configs.plugins.null_ls")
---     end
--- },
 -- -- UI Plugins
 -- {
 --     "akinsho/bufferline.nvim",
diff --git a/lua/configs/options.lua b/lua/configs/options.lua
index 8c46e94..d695ab7 100644
--- a/lua/configs/options.lua
+++ b/lua/configs/options.lua
@@ -23,16 +23,17 @@ vim.opt.smartcase = true -- Dont ignore case when there is capitals
 vim.opt.wildignorecase = true
 vim.opt.wildmenu = false
 
-vim.opt.autoindent = true
-vim.opt.expandtab = true
-vim.opt.smartindent = true
-vim.opt.softtabstop = 4
 vim.opt.splitbelow = true -- Put new windows below current
 vim.opt.splitright = true -- Put new windows right of current
 vim.opt.termguicolors = true
+
 -- Tab and Shift
+vim.opt.autoindent = true
+vim.opt.expandtab = true
 vim.opt.shiftwidth = 4
+vim.opt.smartindent = true
 vim.opt.smarttab = true
+vim.opt.softtabstop = 4
 vim.opt.tabstop = 4 -- Spaces in tab
 
 vim.opt.completeopt = "menu,menuone,noinsert"
diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua
index dcd8f11..75ac536 100644
--- a/lua/plugins/lualine.lua
+++ b/lua/plugins/lualine.lua
@@ -6,55 +6,63 @@ local lsp_status = function()
     end
 end
 
-return {{
-    "nvim-lualine/lualine.nvim",
-    event = "VeryLazy",
-    dependencies = {"nvim-tree/nvim-web-devicons"},
-    opts = {
-        options = {
-            icons_enabled = true,
-            theme = "auto",
-            component_separators = {
-                left = "",
-                right = ""
-            },
-            section_separators = {
-                left = "",
-                right = ""
-            },
-            disabled_filetypes = {"lazy"},
-            always_divide_middle = true,
-            globalstatus = true
-        },
-        sections = {
-            lualine_a = {"mode"},
-            lualine_b = {"branch", "diff", "diagnostics"},
-            lualine_c = {{
-                "filetype",
-                icon_only = true,
-                separator = "",
-                padding = {
-                    left = 1,
-                    right = 0
+return {
+    {
+        "nvim-lualine/lualine.nvim",
+        event = "VeryLazy",
+        dependencies = { "nvim-tree/nvim-web-devicons" },
+        opts = {
+            options = {
+                icons_enabled = true,
+                theme = "auto",
+                component_separators = {
+                    left = "",
+                    right = "",
                 },
-                icon = {
-                    align = "right"
-                }
-            }, "filename"},
-            lualine_x = {"searchcount", lsp_status, "encoding", "fileformat", "filetype"},
-            lualine_y = {"progress"},
-            lualine_z = {"location"}
+                section_separators = {
+                    left = "",
+                    right = "",
+                },
+                always_divide_middle = true,
+                globalstatus = true,
+            },
+            sections = {
+                lualine_a = { "mode" },
+                lualine_b = { "branch", "diff", "diagnostics" },
+                lualine_c = {
+                    {
+                        "filetype",
+                        icon_only = true,
+                        separator = "",
+                        padding = {
+                            left = 1,
+                            right = 0,
+                        },
+                    },
+                    { "filename", path = 1 },
+                },
+                lualine_x = { "searchcount", lsp_status, "encoding", "fileformat", "filetype" },
+                lualine_y = { "progress" },
+                lualine_z = { "location" },
+            },
+            -- winbar = {
+            --     lualine_a = {},
+            --     lualine_b = {},
+            --     lualine_c = { { "filename", path = 1 } },
+            --     lualine_x = {},
+            --     lualine_y = {},
+            --     lualine_z = {},
+            -- },
+            inactive_sections = {
+                lualine_a = {},
+                lualine_b = {},
+                lualine_c = { "filename" },
+                lualine_x = { "location" },
+                lualine_y = {},
+                lualine_z = {},
+            },
+            tabline = {},
+            extensions = { "nvim-tree", "lazy", "symbols-outline", "toggleterm" },
         },
-        inactive_sections = {
-            lualine_a = {},
-            lualine_b = {},
-            lualine_c = {"filename"},
-            lualine_x = {"location"},
-            lualine_y = {},
-            lualine_z = {}
-        },
-        tabline = {},
-        extensions = {"nvim-tree", "symbols-outline", "toggleterm"}
-    }
-}}
-
+    },
+}