Revert "lualine and colorscheme changes"

This reverts commit a95d9001b2.

init.lua

@@ -7,6 +7,7 @@ require("user.notify")
 require("user.navic")
 require("user.cmp")
 require("user.lsp")
+require("user.colorscheme")
 require("user.telescope")
 require("user.treesitter")
 require("user.autopairs")

lua/user/bufferline.lua

@@ -21,7 +21,7 @@ bufferline.setup({
 		tab_size = 21,
 		diagnostics = "nvim_lsp",
 		diagnostics_update_in_insert = true,
-		offsets = { { filetype = "NvimTree", text = "", padding = 1 } },
+		offsets = { { filetype = "NvimTree", text = "" } },
 		show_buffer_icons = true,
 		show_buffer_close_icons = true,
 		show_close_icon = true,

lua/user/colorscheme.lua

@@ -0,0 +1,5 @@
+vim.g.nord_italic = false
+vim.g.nord_contrast = true
+vim.g.nord_borders = true
+require("nord").set()
+require("lsp-colors").setup()

lua/user/lualine.lua

@@ -6,26 +6,10 @@ end
 lualine.setup({
 	options = {
 		icons_enabled = true,
-		theme = "onenord",
+		theme = "auto",
 		component_separators = { left = "", right = "" },
 		section_separators = { left = "", right = "" },
-		disabled_filetypes = {
+		disabled_filetypes = { "alpha", "NvimTree" },
-			statusline = { "alpha", "NvimTree" },
-			winbar = {
-				"help",
-				"startify",
-				"dashboard",
-				"packer",
-				"neogitstatus",
-				"NvimTree",
-				"Trouble",
-				"alpha",
-				"lir",
-				"Outline",
-				"spectre_panel",
-				"toggleterm",
-			},
-		},
 		always_divide_middle = true,
 	},
 	sections = {
@@ -44,22 +28,6 @@ lualine.setup({
 		lualine_y = {},
 		lualine_z = {},
 	},
-	winbar = {
-		lualine_a = { require("user.winbar").get_winbar() },
-		lualine_b = {},
-		lualine_c = {},
-		lualine_x = {},
-		lualine_y = {},
-		lualine_z = {},
-	},
-	inactive_winbar = {
-		lualine_a = {},
-		lualine_b = {},
-		lualine_c = {},
-		lualine_x = {},
-		lualine_y = {},
-		lualine_z = {},
-	},
 	tabline = {},
 	extensions = {
 		"nvim-tree",

lua/user/options.lua

@@ -36,6 +36,7 @@ vim.opt.incsearch = true
 vim.opt.colorcolumn = "120"
 vim.opt.list = true
 vim.opt.listchars:append("lead:.")
+vim.opt.winbar = "%{%v:lua.require'user.winbar'.get_winbar()%}"
 vim.opt.foldcolumn = "2"
 vim.opt.foldlevel = 99
 vim.opt.foldlevelstart = -1

lua/user/plugins.lua

@@ -48,19 +48,9 @@ return packer.startup(function(use)
 	use("antoinemadec/FixCursorHold.nvim")
 	use("kevinhwang91/promise-async")
 
-	-- Theme
+	-- Themes
-	use({
+	use("shaunsingh/nord.nvim")
-		"rmehri01/onenord.nvim",
+	use("folke/lsp-colors.nvim")
-		config = function()
-			require("onenord").setup()
-		end,
-	})
-	use({
-		"folke/lsp-colors.nvim",
-		config = function()
-			require("lsp-colors").setup()
-		end,
-	})
 
 	-- Completion
 	use("hrsh7th/nvim-cmp")

lua/user/winbar.lua

@@ -7,6 +7,29 @@ local function is_empty(s)
 	return s == nil or s == ""
 end
 
+M.winbar_filetype_exclude = {
+	"help",
+	"startify",
+	"dashboard",
+	"packer",
+	"neogitstatus",
+	"NvimTree",
+	"Trouble",
+	"alpha",
+	"lir",
+	"Outline",
+	"spectre_panel",
+	"toggleterm",
+}
+
+local excludes = function()
+	if vim.tbl_contains(M.winbar_filetype_exclude, vim.bo.filetype) then
+		vim.opt_local.winbar = nil
+		return true
+	end
+	return false
+end
+
 local function get_filename()
 	return "%#WinBarFilename#" .. "%t" .. "%*"
 end
@@ -45,6 +68,9 @@ local function get_fileicon()
 end
 
 function M.get_winbar()
+	if excludes() then
+		return ""
+	end
 	if navic.is_available() then
 		return get_fileicon() .. get_filename() .. get_location()
 	else