Merge branch 'master' of github.com:olinpin/dotfiles

nvim/lua/olinpin/plugins/color.lua

@@ -1,25 +1,25 @@
 function ColorMe(color)
-    color = color or "OceanicNext"
+	color = color or "OceanicNext"
-    vim.cmd.colorscheme(color)
+	vim.cmd.colorscheme(color)
 
-    vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
+	vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
-    vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
+	vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
 end
 
 return {
-    {
+	{
-        'mhartington/oceanic-next',
+		"mhartington/oceanic-next",
-        config = function ()
+		config = function()
-            -- require('oceanic-next').setup()
+			-- require('oceanic-next').setup()
-            vim.cmd.colorscheme('OceanicNext')
+			vim.cmd.colorscheme("OceanicNext")
-            vim.cmd("highlight! EndOfBuffer guibg=background guifg=background")
+			vim.cmd("highlight! EndOfBuffer guibg=background guifg=background")
-        end
+		end,
-    }
+	},
-    -- {
+	-- {
-    --     'nxvu699134/vn-night.nvim',
+	--     'nxvu699134/vn-night.nvim',
-    --     config = function ()
+	--     config = function ()
-    --         vim.cmd.colorscheme('vn-night')
+	--         vim.cmd.colorscheme('vn-night')
-    --         vim.cmd("highlight! EndOfBuffer guibg=background guifg=background")
+	--         vim.cmd("highlight! EndOfBuffer guibg=background guifg=background")
-    --     end
+	--     end
-    -- }
+	-- }
 }

nvim/lua/olinpin/plugins/lualine.lua

@@ -2,26 +2,31 @@ return {
 	"nvim-lualine/lualine.nvim",
 	event = "VeryLazy",
 	requires = { "nvim-tree/nvim-web-devicons", opt = true },
-	opts = {
+	init = function()
-		options = {
+		local lualine = require("lualine")
-			theme = "ayu_mirage",
+		local custom_ayu_mirage = require("lualine.themes.ayu_mirage")
-		},
+		custom_ayu_mirage.normal.c.bg = "#172c35"
-		section_separators = { left = "", right = "" },
+		lualine.setup({
-		component_separators = { left = "", right = "" },
+			section_separators = { left = "", right = "" },
-		sections = {
+			component_separators = { left = "", right = "" },
-			lualine_a = { "mode" },
+			sections = {
-			lualine_b = { "branch", "diff", "diagnostics" },
+				lualine_a = { "mode" },
-			lualine_c = {
+				lualine_b = { "branch", "diff", "diagnostics" },
-				{
+				lualine_c = {
-					"filename",
+					{
-					file_status = true,
+						"filename",
-					path = 1,
+						file_status = true,
-					shorting_target = 40,
+						path = 1,
+						shorting_target = 40,
+					},
 				},
+				lualine_x = { "filetype" },
+				lualine_y = { "progress" },
+				lualine_z = { "location" },
 			},
-			lualine_x = { "filetype" },
+			options = {
-			lualine_y = { "progress" },
+				theme = custom_ayu_mirage,
-			lualine_z = { "location" },
+			},
-		},
+		})
-	},
+	end,
 }