Merge commit 'd8bd0720c80cb556b5e828d1b749f0e61ed6acaf'

4 files changed, 903 insertions, 880 deletions

diff --git a/.config/nvim/lua/plugins/colorscheme.lua b/.config/nvim/lua/plugins/colorscheme.lua
index fea831c..2f3782a 100644
--- a/.config/nvim/lua/plugins/colorscheme.lua
+++ b/.config/nvim/lua/plugins/colorscheme.lua
@@ -1,7 +1,7 @@
 -- Colorscheme
 -- Available colorschemes:
 -- [[ nightfly ayu onedark doom-one ]]
-local colorscheme = "nightfly"
+local colorscheme = "nvimgelion"
 local status_ok, _ = pcall(vim.cmd, "colorscheme " .. colorscheme)
 if not status_ok then
   vim.notify("colorscheme " .. colorscheme .. " not found!")
diff --git a/.config/nvim/lua/plugins/heirline.lua b/.config/nvim/lua/plugins/heirline.lua
index 6c05e28..caa890c 100644
--- a/.config/nvim/lua/plugins/heirline.lua
+++ b/.config/nvim/lua/plugins/heirline.lua
@@ -2,34 +2,35 @@ local conditions = require("heirline.conditions")
 local utils = require("heirline.utils")
 
 local colors = {
-	--bg = "#23232e",
-	bg = nil,
-	nobg = nil,
-	white = "#f8f8f2",
+  --bg = "#23232e",
+  bg = nil,
+  nobg = "NONE",
+  transparency = "NONE",
+  white = "#f8f8f2",
   black = "#000000",
-	darkgray = "#23232e",
-	gray = "#2d2b3a",
-	lightgray = "#d6d3ea",
-	pink = "#f92672",
-	green = "#50fa7b",
-	blue = "#39BAE6",
-	yellow = "#f1fa8c",
-	orange = "#ffb86c",
-	purple = "#BF40BF",
-	violet = "#7F00FF",
-	red = "#ff5555",
-	cyan = "#66d9eC",
-	diag = {
-		warn = utils.get_highlight("DiagnosticSignWarn").fg,
-		error = utils.get_highlight("DiagnosticSignError").fg,
-		hint = utils.get_highlight("DiagnosticSignHint").fg,
-		info = utils.get_highlight("DiagnosticSignInfo").fg,
-	},
-	git = {
-		del = "#e95678",
-		add = "#a6e22e",
-		change = "#ae81ff",
-	},
+  darkgray = "#23232e",
+  gray = "#2d2b3a",
+  lightgray = "#d6d3ea",
+  pink = "#f92672",
+  green = "#50fa7b",
+  blue = "#39BAE6",
+  yellow = "#f1fa8c",
+  orange = "#ffb86c",
+  purple = "#BF40BF",
+  violet = "#7F00FF",
+  red = "#ff5555",
+  cyan = "#66d9eC",
+  diag = {
+    warn = utils.get_highlight("DiagnosticSignWarn").fg,
+    error = utils.get_highlight("DiagnosticSignError").fg,
+    hint = utils.get_highlight("DiagnosticSignHint").fg,
+    info = utils.get_highlight("DiagnosticSignInfo").fg,
+  },
+  git = {
+    del = "#e95678",
+    add = "#a6e22e",
+    change = "#ae81ff",
+  },
 }
 
 require("heirline").load_colors(colors)
@@ -46,330 +47,329 @@ local LeftSep = { provider = "" }
 local RightSep = { provider = "" }
 
 local ViMode = {
-	init = function(self)
-		self.mode = vim.fn.mode(1)
-		if not self.once then
-			vim.cmd("au ModeChanged *:*o redrawstatus")
-		end
-		self.once = true
-	end,
-	static = {
-		mode_names = {
-			n = "NORMAL ",
-			no = "N·OPERATOR PENDING ",
-			nov = "N?",
-			noV = "N?",
-			["no\22"] = "N? ",
-			niI = "Ni",
-			niR = "Nr",
-			niV = "Nv",
-			nt = "Nt",
-			v = "VISUAL ",
-			vs = "Vs",
-			V = "V·LINE ",
-			["\22"] = "V·BLOCK ",
-			["\22s"] = "V·BLOCK ",
-			s = "SELECT ",
-			S = "S·LINE ",
-			["\19"] = "S·BLOCK ",
-			i = "INSERT ",
-			ix = "insert x ",
-			ic = "insert c ",
-			R = "REPLACE ",
-			Rc = "Rc",
-			Rx = "Rx",
-			Rv = "V·REPLACE ",
-			Rvc = "Rv",
-			Rvx = "Rv",
-			c = "COMMAND ",
-			cv = "VIM EX ",
-			ce = "EX ",
-			r = "PROMPT ",
-			rm = "MORE ",
-			["r?"] = "CONFIRM ",
-			["!"] = "SHELL ",
-			t = "TERMINAL ",
-		},
-	},
-	provider = function(self)
-		return "  %2(" .. self.mode_names[self.mode] .. "%) "
-	end,
-	hl = function(self)
-		local color = self:mode_color()
-		return { fg = color, bold = true }
-	end,
-	update = {
-		"ModeChanged",
-	},
+  init = function(self)
+    self.mode = vim.fn.mode(1)
+    if not self.once then
+      vim.cmd("au ModeChanged *:*o redrawstatus")
+    end
+    self.once = true
+  end,
+  static = {
+    mode_names = {
+      n = "NORMAL ",
+      no = "N·OPERATOR PENDING ",
+      nov = "N?",
+      noV = "N?",
+      ["no\22"] = "N? ",
+      niI = "Ni",
+      niR = "Nr",
+      niV = "Nv",
+      nt = "Nt",
+      v = "VISUAL ",
+      vs = "Vs",
+      V = "V·LINE ",
+      ["\22"] = "V·BLOCK ",
+      ["\22s"] = "V·BLOCK ",
+      s = "SELECT ",
+      S = "S·LINE ",
+      ["\19"] = "S·BLOCK ",
+      i = "INSERT ",
+      ix = "insert x ",
+      ic = "insert c ",
+      R = "REPLACE ",
+      Rc = "Rc",
+      Rx = "Rx",
+      Rv = "V·REPLACE ",
+      Rvc = "Rv",
+      Rvx = "Rv",
+      c = "COMMAND ",
+      cv = "VIM EX ",
+      ce = "EX ",
+      r = "PROMPT ",
+      rm = "MORE ",
+      ["r?"] = "CONFIRM ",
+      ["!"] = "SHELL ",
+      t = "TERMINAL ",
+    },
+  },
+  provider = function(self)
+    return "  %2(" .. self.mode_names[self.mode] .. "%) "
+  end,
+  hl = function(self) return { fg = "darkgray", bg = self.mode_color, bold = true } end,
+  --hl = function(self) return { fg = self.mode_color, bg = "bg" } end,
+  --	hl = function(self)
+  --    local color = self.mode:sub(1, 1) -- get only the first mode character
+  --    --return { fg = self.mode_colors[mode], bold = true, }
+  --		--local color = self:mode_color()
+  --		return { fg = color, bold = true }
+  --  		return { fg = colors.black, bg = color, bold = true }
+  --	end,
+  update = {
+    "ModeChanged",
+  },
 }
 
 -- LSP
 local LSPActive = {
-	condition = conditions.lsp_attached,
-	update = { "LspAttach", "LspDetach" },
-
-	provider = function()
-		local buf_clients = vim.lsp.buf_get_clients()
-		local buf_client_names = {}
-
-		-- add client
-		for _, client in pairs(buf_clients) do
-			if client.name ~= "null-ls" then
-				table.insert(buf_client_names, client.name)
-			end
-		end
-		return "⚙️ " .. table.concat(buf_client_names, "")
-	end,
-	hl = { fg = colors.lightgray, bold = false },
+  condition = conditions.lsp_attached,
+  update = { "LspAttach", "LspDetach" },
+  provider = function()
+    local buf_clients = vim.lsp.buf_get_clients()
+    local buf_client_names = {}
+
+    -- add client
+    for _, client in pairs(buf_clients) do
+      if client.name ~= "null-ls" then
+        table.insert(buf_client_names, client.name)
+      end
+    end
+    return "⚙️ " .. table.concat(buf_client_names, "")
+  end,
+  hl = { fg = colors.lightgray, bold = false },
 }
 
 local Navic = {
-    condition = require("nvim-navic").is_available,
-    static = {
-        -- create a type highlight map
-        type_hl = {
-            File = "Directory",
-            Module = "@include",
-            Namespace = "@namespace",
-            Package = "@include",
-            Class = "@structure",
-            Method = "@method",
-            Property = "@property",
-            Field = "@field",
-            Constructor = "@constructor",
-            Enum = "@field",
-            Interface = "@type",
-            Function = "@function",
-            Variable = "@variable",
-            Constant = "@constant",
-            String = "@string",
-            Number = "@number",
-            Boolean = "@boolean",
-            Array = "@field",
-            Object = "@type",
-            Key = "@keyword",
-            Null = "@comment",
-            EnumMember = "@field",
-            Struct = "@structure",
-            Event = "@keyword",
-            Operator = "@operator",
-            TypeParameter = "@type",
-        },
-        -- bit operation dark magic, see below...
-        enc = function(line, col, winnr)
-            return bit.bor(bit.lshift(line, 16), bit.lshift(col, 6), winnr)
-        end,
-        -- line: 16 bit (65535); col: 10 bit (1023); winnr: 6 bit (63)
-        dec = function(c)
-            local line = bit.rshift(c, 16)
-            local col = bit.band(bit.rshift(c, 6), 1023)
-            local winnr = bit.band(c,  63)
-            return line, col, winnr
-        end
+  condition = require("nvim-navic").is_available,
+  static = {
+    -- create a type highlight map
+    type_hl = {
+      File = "Directory",
+      Module = "@include",
+      Namespace = "@namespace",
+      Package = "@include",
+      Class = "@structure",
+      Method = "@method",
+      Property = "@property",
+      Field = "@field",
+      Constructor = "@constructor",
+      Enum = "@field",
+      Interface = "@type",
+      Function = "@function",
+      Variable = "@variable",
+      Constant = "@constant",
+      String = "@string",
+      Number = "@number",
+      Boolean = "@boolean",
+      Array = "@field",
+      Object = "@type",
+      Key = "@keyword",
+      Null = "@comment",
+      EnumMember = "@field",
+      Struct = "@structure",
+      Event = "@keyword",
+      Operator = "@operator",
+      TypeParameter = "@type",
     },
-    init = function(self)
-        local data = require("nvim-navic").get_data() or {}
-        local children = {}
-        -- create a child for each level
-        for i, d in ipairs(data) do
-            -- encode line and column numbers into a single integer
-            local pos = self.enc(d.scope.start.line, d.scope.start.character, self.winnr)
-            local child = {
-                {
-                    provider = d.icon,
-                    hl = self.type_hl[d.type],
-                },
-                {
-                    -- escape `%`s (elixir) and buggy default separators
-                    provider = d.name:gsub("%%", "%%%%"):gsub("%s*->%s*", ''),
-                    -- highlight icon only or location name as well
-                    -- hl = self.type_hl[d.type],
-
-                    on_click = {
-                        -- pass the encoded position through minwid
-                        minwid = pos,
-                        callback = function(_, minwid)
-                            -- decode
-                            local line, col, winnr = self.dec(minwid)
-                            vim.api.nvim_win_set_cursor(vim.fn.win_getid(winnr), {line, col})
-                        end,
-                        name = "heirline_navic",
-                    },
-                },
-            }
-            -- add a separator only if needed
-            if #data > 1 and i < #data then
-                table.insert(child, {
-                    provider = " > ",
-                    hl = { fg = 'bright_fg' },
-                })
-            end
-            table.insert(children, child)
-        end
-        -- instantiate the new child, overwriting the previous one
-        self.child = self:new(children, 1)
-    end,
-    -- evaluate the children containing navic components
-    provider = function(self)
-        return self.child:eval()
+    -- bit operation dark magic, see below...
+    enc = function(line, col, winnr)
+      return bit.bor(bit.lshift(line, 16), bit.lshift(col, 6), winnr)
     end,
-    hl = { fg = colors.white },
-    update = 'CursorMoved'
+    -- line: 16 bit (65535); col: 10 bit (1023); winnr: 6 bit (63)
+    dec = function(c)
+      local line = bit.rshift(c, 16)
+      local col = bit.band(bit.rshift(c, 6), 1023)
+      local winnr = bit.band(c, 63)
+      return line, col, winnr
+    end
+  },
+  init = function(self)
+    local data = require("nvim-navic").get_data() or {}
+    local children = {}
+    -- create a child for each level
+    for i, d in ipairs(data) do
+      -- encode line and column numbers into a single integer
+      local pos = self.enc(d.scope.start.line, d.scope.start.character, self.winnr)
+      local child = {
+        {
+          provider = d.icon,
+          hl = self.type_hl[d.type],
+        },
+        {
+          -- escape `%`s (elixir) and buggy default separators
+          provider = d.name:gsub("%%", "%%%%"):gsub("%s*->%s*", ''),
+          -- highlight icon only or location name as well
+          -- hl = self.type_hl[d.type],
+
+          on_click = {
+            -- pass the encoded position through minwid
+            minwid = pos,
+            callback = function(_, minwid)
+              -- decode
+              local line, col, winnr = self.dec(minwid)
+              vim.api.nvim_win_set_cursor(vim.fn.win_getid(winnr), { line, col })
+            end,
+            name = "heirline_navic",
+          },
+        },
+      }
+      -- add a separator only if needed
+      if #data > 1 and i < #data then
+        table.insert(child, {
+          provider = " > ",
+          hl = { fg = 'bright_fg' },
+        })
+      end
+      table.insert(children, child)
+    end
+    -- instantiate the new child, overwriting the previous one
+    self.child = self:new(children, 1)
+  end,
+  -- evaluate the children containing navic components
+  provider = function(self)
+    return self.child:eval()
+  end,
+  hl = { fg = colors.white },
+  update = 'CursorMoved'
 }
 
 -- Diagnostics
 local Diagnostics = {
-
-	condition = conditions.has_diagnostics,
-
-	static = {
-		error_icon = vim.fn.sign_getdefined("DiagnosticSignError")[1].text,
-		warn_icon = vim.fn.sign_getdefined("DiagnosticSignWarn")[1].text,
-		info_icon = vim.fn.sign_getdefined("DiagnosticSignInfo")[1].text,
-		hint_icon = vim.fn.sign_getdefined("DiagnosticSignHint")[1].text,
-	},
-
-	init = function(self)
-		self.errors = #vim.diagnostic.get(0, { severity = vim.diagnostic.severity.ERROR })
-		self.warnings = #vim.diagnostic.get(0, { severity = vim.diagnostic.severity.WARN })
-		self.hints = #vim.diagnostic.get(0, { severity = vim.diagnostic.severity.HINT })
-		self.info = #vim.diagnostic.get(0, { severity = vim.diagnostic.severity.INFO })
-	end,
-
-	update = { "DiagnosticChanged", "BufEnter" },
-
-	{
-		provider = function(self)
-			-- 0 is just another output, we can decide to print it or not!
-			return self.errors > 0 and (self.error_icon .. self.errors .. " ")
-		end,
-		hl = { fg = colors.diag.error, bg = colors.bg },
-	},
-	{
-		provider = function(self)
-			return self.warnings > 0 and (self.warn_icon .. self.warnings .. " ")
-		end,
-		hl = { fg = colors.diag.warn, bg = colors.bg },
-	},
-	{
-		provider = function(self)
-			return self.info > 0 and (self.info_icon .. self.info .. " ")
-		end,
-		hl = { fg = colors.diag.info, bg = colors.bg },
-	},
-	{
-		provider = function(self)
-			return self.hints > 0 and (self.hint_icon .. self.hints)
-		end,
-		hl = { fg = colors.diag.hint, bg = colors.bg },
-	},
-	on_click = {
-		callback = function()
-			require("trouble").toggle({ mode = "document_diagnostics" })
-			-- or
-			-- vim.diagnostic.setqflist()
-		end,
-		name = "heirline_diagnostics",
-	},
+  condition = conditions.has_diagnostics,
+  static = {
+    error_icon = vim.fn.sign_getdefined("DiagnosticSignError")[1].text,
+    warn_icon = vim.fn.sign_getdefined("DiagnosticSignWarn")[1].text,
+    info_icon = vim.fn.sign_getdefined("DiagnosticSignInfo")[1].text,
+    hint_icon = vim.fn.sign_getdefined("DiagnosticSignHint")[1].text,
+  },
+  init = function(self)
+    self.errors = #vim.diagnostic.get(0, { severity = vim.diagnostic.severity.ERROR })
+    self.warnings = #vim.diagnostic.get(0, { severity = vim.diagnostic.severity.WARN })
+    self.hints = #vim.diagnostic.get(0, { severity = vim.diagnostic.severity.HINT })
+    self.info = #vim.diagnostic.get(0, { severity = vim.diagnostic.severity.INFO })
+  end,
+  update = { "DiagnosticChanged", "BufEnter" },
+  {
+    provider = function(self)
+      -- 0 is just another output, we can decide to print it or not!
+      return self.errors > 0 and (self.error_icon .. self.errors .. " ")
+    end,
+    hl = { fg = colors.diag.error, bg = colors.bg },
+  },
+  {
+    provider = function(self)
+      return self.warnings > 0 and (self.warn_icon .. self.warnings .. " ")
+    end,
+    hl = { fg = colors.diag.warn, bg = colors.bg },
+  },
+  {
+    provider = function(self)
+      return self.info > 0 and (self.info_icon .. self.info .. " ")
+    end,
+    hl = { fg = colors.diag.info, bg = colors.bg },
+  },
+  {
+    provider = function(self)
+      return self.hints > 0 and (self.hint_icon .. self.hints)
+    end,
+    hl = { fg = colors.diag.hint, bg = colors.bg },
+  },
+  on_click = {
+    callback = function()
+      require("trouble").toggle({ mode = "document_diagnostics" })
+      -- or
+      -- vim.diagnostic.setqflist()
+    end,
+    name = "heirline_diagnostics",
+  },
 }
 
 -- Git
 -- For the ones who're not (too) afraid of changes! Uses gitsigns.
 local Git = {
-	condition = conditions.is_git_repo,
-
-	init = function(self)
-		self.status_dict = vim.b.gitsigns_status_dict
-		self.has_changes = self.status_dict.added ~= 0 or self.status_dict.removed ~= 0 or self.status_dict.changed ~= 0
-	end,
-	--hl = { fg = "orange" },
-	hl = { fg = colors.orange, bg = colors.bg },
-	{ -- git branch name
-		provider = function(self)
-			return " " .. self.status_dict.head
-		end,
-		--hl = { bold = true },
-		hl = { bold = true, bg = colors.bg },
-	},
-	-- You could handle delimiters, icons and counts similar to Diagnostics
-	{
-		condition = function(self)
-			return self.has_changes
-		end,
-		--provider = "("
-		provider = " ",
-	},
-	{
-		provider = function(self)
-			local count = self.status_dict.added or 0
-			--return count > 0 and ("+" .. count)
-			return count > 0 and ("  " .. count)
-		end,
-		--hl = { fg = "git_add" },
-		hl = { fg = colors.git.add, bg = colors.bg },
-	},
-	{
-		provider = function(self)
-			local count = self.status_dict.removed or 0
-			--return count > 0 and ("-" .. count)
-			return count > 0 and ("  " .. count)
-		end,
-		--hl = { fg = "git_del" },
-		hl = { fg = colors.git.del, bg = colors.bg },
-	},
-	{
-		provider = function(self)
-			local count = self.status_dict.changed or 0
-			--return count > 0 and ("~" .. count)
-			return count > 0 and (" 柳" .. count)
-		end,
-		--hl = { fg = "git_change" },
-		hl = { fg = colors.git.change, bg = colors.bg },
-	},
-	--{
-	--    condition = function(self)
-	--        return self.has_changes
-	--    end,
-	--    provider = ")",
-	--},
-	on_click = {
-		callback = function()
-			-- If you want to use Fugitive:
-			-- vim.cmd("G")
-
-			-- If you prefer Lazygit
-			-- use vim.defer_fn() if the callback requires
-			-- opening of a floating window
-			-- (this also applies to telescope)
-			vim.defer_fn(function()
-				vim.cmd("Lazygit")
-			end, 100)
-		end,
-		name = "heirline_git",
-	},
+  condition = conditions.is_git_repo,
+  init = function(self)
+    self.status_dict = vim.b.gitsigns_status_dict
+    self.has_changes = self.status_dict.added ~= 0 or self.status_dict.removed ~= 0 or self.status_dict.changed ~= 0
+  end,
+  --hl = { fg = "orange" },
+  hl = { fg = colors.orange, bg = colors.bg },
+  {
+   -- git branch name
+    provider = function(self)
+      return " " .. self.status_dict.head
+    end,
+    --hl = { bold = true },
+    hl = { bold = true, bg = colors.bg },
+  },
+  -- You could handle delimiters, icons and counts similar to Diagnostics
+  {
+    condition = function(self)
+      return self.has_changes
+    end,
+    --provider = "("
+    provider = " ",
+  },
+  {
+    provider = function(self)
+      local count = self.status_dict.added or 0
+      --return count > 0 and ("+" .. count)
+      return count > 0 and ("  " .. count)
+    end,
+    --hl = { fg = "git_add" },
+    hl = { fg = colors.git.add, bg = colors.bg },
+  },
+  {
+    provider = function(self)
+      local count = self.status_dict.removed or 0
+      --return count > 0 and ("-" .. count)
+      return count > 0 and ("  " .. count)
+    end,
+    --hl = { fg = "git_del" },
+    hl = { fg = colors.git.del, bg = colors.bg },
+  },
+  {
+    provider = function(self)
+      local count = self.status_dict.changed or 0
+      --return count > 0 and ("~" .. count)
+      return count > 0 and (" 柳" .. count)
+    end,
+    --hl = { fg = "git_change" },
+    hl = { fg = colors.git.change, bg = colors.bg },
+  },
+  --{
+  --    condition = function(self)
+  --        return self.has_changes
+  --    end,
+  --    provider = ")",
+  --},
+  on_click = {
+    callback = function()
+      -- If you want to use Fugitive:
+      -- vim.cmd("G")
+
+      -- If you prefer Lazygit
+      -- use vim.defer_fn() if the callback requires
+      -- opening of a floating window
+      -- (this also applies to telescope)
+      vim.defer_fn(function()
+        vim.cmd("Lazygit")
+      end, 100)
+    end,
+    name = "heirline_git",
+  },
 }
 
 -- Debugger
 -- Display informations from nvim-dap!
 local DAPMessages = {
-	-- display the dap messages only on the debugged file
-	condition = function()
-		local session = require("dap").session()
-		if session then
-			local filename = vim.api.nvim_buf_get_name(0)
-			if session.config then
-				local progname = session.config.program
-				return filename == progname
-			end
-		end
-		return false
-	end,
-	provider = function()
-		return " " .. require("dap").status()
-	end,
-	hl = { fg = utils.get_highlight("Debug").fg },
-	-- Debugger on_click: step-over, step-into, next, previous, stop buttons
-	--    coming soon!
+  -- display the dap messages only on the debugged file
+  condition = function()
+    local session = require("dap").session()
+    if session then
+      local filename = vim.api.nvim_buf_get_name(0)
+      if session.config then
+        local progname = session.config.program
+        return filename == progname
+      end
+    end
+    return false
+  end,
+  provider = function()
+    return " " .. require("dap").status()
+  end,
+  hl = { fg = utils.get_highlight("Debug").fg },
+  -- Debugger on_click: step-over, step-into, next, previous, stop buttons
+  --    coming soon!
 }
 
 -- Tests
@@ -415,192 +415,192 @@ local DAPMessages = {
 
 -- FileNameBlock: FileIcon, FileName and friends
 local FileNameBlock = {
-	-- let's first set up some attributes needed by this component and it's children
-	init = function(self)
-		self.filename = vim.api.nvim_buf_get_name(0)
-	end,
-	--hl = { fg = utils.get_highlight("Statusline").fg, bold = true, bg = colors.bg },
-	hl = { bg = colors.bg },
+  -- let's first set up some attributes needed by this component and it's children
+  init = function(self)
+    self.filename = vim.api.nvim_buf_get_name(0)
+  end,
+  --hl = { fg = utils.get_highlight("Statusline").fg, bold = true, bg = colors.bg },
+  hl = { bg = colors.bg },
 }
 
 -- FileIcon, FileName, FileFlags and FileNameModifier
 local FileIcon = {
-	init = function(self)
-		local filename = self.filename
-		local extension = vim.fn.fnamemodify(filename, ":e")
-		self.icon, self.icon_color =
-			require("nvim-web-devicons").get_icon_color(filename, extension, { default = true })
-	end,
-	provider = function(self)
-		return self.icon and (self.icon .. " ")
-	end,
-	hl = function(self)
-		return { fg = self.icon_color, bg = colors.bg }
-	end,
+  init = function(self)
+    local filename = self.filename
+    local extension = vim.fn.fnamemodify(filename, ":e")
+    self.icon, self.icon_color =
+        require("nvim-web-devicons").get_icon_color(filename, extension, { default = true })
+  end,
+  provider = function(self)
+    return self.icon and (self.icon .. " ")
+  end,
+  hl = function(self)
+    return { fg = self.icon_color, bg = colors.bg }
+  end,
 }
 
 local FileName = {
-	provider = function(self)
-		-- first, trim the pattern relative to the current directory. For other
-		-- options, see :h filename-modifers
-		local filename = vim.fn.fnamemodify(self.filename, ":.")
-		if filename == "" then
-			return "No Name"
-		end
-		-- now, if the filename would occupy more than 1/4th of the available
-		-- space, we trim the file path to its initials
-		-- See Flexible Components section below for dynamic truncation
-		if not conditions.width_percent_below(#filename, 0.25) then
-			filename = vim.fn.pathshorten(filename)
-		end
-		return filename
-	end,
-	--hl = { fg = utils.get_highlight("Statusline").fg, bold = false, bg = colors.bg },
-	hl = { fg = colors.white, bold = false, bg = colors.bg },
+  provider = function(self)
+    -- first, trim the pattern relative to the current directory. For other
+    -- options, see :h filename-modifers
+    local filename = vim.fn.fnamemodify(self.filename, ":.")
+    if filename == "" then
+      return "No Name"
+    end
+    -- now, if the filename would occupy more than 1/4th of the available
+    -- space, we trim the file path to its initials
+    -- See Flexible Components section below for dynamic truncation
+    if not conditions.width_percent_below(#filename, 0.25) then
+      filename = vim.fn.pathshorten(filename)
+    end
+    return filename
+  end,
+  --hl = { fg = utils.get_highlight("Statusline").fg, bold = false, bg = colors.bg },
+  hl = { fg = colors.white, bold = false, bg = colors.bg },
 }
 
 local FileFlags = {
-	{
-		provider = function()
-			if vim.bo.modified then
-				return " [+]" -- ±[+]
-			end
-		end,
-		hl = { fg = colors.green, bg = colors.bg },
-	},
-	{
-		provider = function()
-			if not vim.bo.modifiable or vim.bo.readonly then
-				return " "
-			end
-		end,
-		--hl = { fg = colors.orange },
-		hl = { fg = colors.orange, bold = true, bg = colors.bg },
-	},
+  {
+    provider = function()
+      if vim.bo.modified then
+        return " [+]" -- ±[+]
+      end
+    end,
+    hl = { fg = colors.green, bg = colors.bg },
+  },
+  {
+    provider = function()
+      if not vim.bo.modifiable or vim.bo.readonly then
+        return " "
+      end
+    end,
+    --hl = { fg = colors.orange },
+    hl = { fg = colors.orange, bold = true, bg = colors.bg },
+  },
 }
 
 local FileNameModifier = {
-	hl = function()
-		if vim.bo.modified then
-			return { fg = colors.green, bold = false, force = true }
-		end
-	end,
+  hl = function()
+    if vim.bo.modified then
+      return { fg = colors.green, bold = false, force = true }
+    end
+  end,
 }
 
 -- FileType, FileEncoding and FileFormat
 local FileType = {
-	provider = function()
-		return vim.bo.filetype
-	end,
-	hl = { fg = colors.white, bold = false, bg = colors.bg },
+  provider = function()
+    return vim.bo.filetype
+  end,
+  hl = { fg = colors.white, bold = false, bg = colors.bg },
 }
 
 local FileEncoding = {
-	Space,
-	provider = function()
-		local enc = (vim.bo.fenc ~= "" and vim.bo.fenc) or vim.o.enc -- :h 'enc'
-		return enc:lower()
-	end,
-	--hl = { fg = utils.get_highlight("Statusline").fg, bold = true, bg = colors.bg },
-	hl = { bg = colors.bg, bold = false },
+  Space,
+  provider = function()
+    local enc = (vim.bo.fenc ~= "" and vim.bo.fenc) or vim.o.enc -- :h 'enc'
+    return enc:lower()
+  end,
+  --hl = { fg = utils.get_highlight("Statusline").fg, bold = true, bg = colors.bg },
+  hl = { bg = colors.bg, bold = false },
 }
 
 local FileFormat = {
-	provider = function()
-		local fmt = vim.bo.fileformat
-		--return fmt ~= "unix" and fmt:upper()
-		return fmt ~= "unix" and fmt:lower()
-	end,
-	hl = { fg = utils.get_highlight("Statusline").fg, bold = true, bg = colors.bg },
+  provider = function()
+    local fmt = vim.bo.fileformat
+    --return fmt ~= "unix" and fmt:upper()
+    return fmt ~= "unix" and fmt:lower()
+  end,
+  hl = { fg = utils.get_highlight("Statusline").fg, bold = true, bg = colors.bg },
 }
 
 -- FileSize and FileLastModified
 local FileSize = {
-	provider = function()
-		-- stackoverflow, compute human readable file size
-		local suffix = { "b", "k", "M", "G", "T", "P", "E" }
-		local fsize = vim.fn.getfsize(vim.api.nvim_buf_get_name(0))
-		fsize = (fsize < 0 and 0) or fsize
-		if fsize < 1024 then
-			return fsize .. suffix[1]
-		end
-		local i = math.floor((math.log(fsize) / math.log(1024)))
-		return string.format("%.2g%s", fsize / math.pow(1024, i), suffix[i + 1])
-	end,
-	hl = { fg = utils.get_highlight("Statusline").fg, bold = true, bg = colors.bg },
+  provider = function()
+    -- stackoverflow, compute human readable file size
+    local suffix = { "b", "k", "M", "G", "T", "P", "E" }
+    local fsize = vim.fn.getfsize(vim.api.nvim_buf_get_name(0))
+    fsize = (fsize < 0 and 0) or fsize
+    if fsize < 1024 then
+      return fsize .. suffix[1]
+    end
+    local i = math.floor((math.log(fsize) / math.log(1024)))
+    return string.format("%.2g%s", fsize / math.pow(1024, i), suffix[i + 1])
+  end,
+  hl = { fg = utils.get_highlight("Statusline").fg, bold = true, bg = colors.bg },
 }
 
 local FileLastModified = {
-	-- did you know? Vim is full of functions!
-	provider = function()
-		local ftime = vim.fn.getftime(vim.api.nvim_buf_get_name(0))
-		return (ftime > 0) and os.date("%c", ftime)
-	end,
-	hl = { fg = utils.get_highlight("Statusline").fg, bold = true, bg = colors.bg },
+  -- did you know? Vim is full of functions!
+  provider = function()
+    local ftime = vim.fn.getftime(vim.api.nvim_buf_get_name(0))
+    return (ftime > 0) and os.date("%c", ftime)
+  end,
+  hl = { fg = utils.get_highlight("Statusline").fg, bold = true, bg = colors.bg },
 }
 
 -- Spell
 -- Add indicator when spell is set!
 local Spell = {
-	condition = function()
-		return vim.wo.spell
-	end,
-	provider = " 暈",
-	hl = { bold = true, fg = colors.yellow },
+  condition = function()
+    return vim.wo.spell
+  end,
+  provider = " 暈",
+  hl = { bold = true, fg = colors.yellow },
 }
 
 local help_file_name = {
-	condition = function()
-		return vim.bo.filetype == "help"
-	end,
-	provider = function()
-		local filename = vim.api.nvim_buf_get_name(0)
-		return vim.fn.fnamemodify(filename, ":t")
-	end,
-	hl = { fg = colors.blue },
+  condition = function()
+    return vim.bo.filetype == "help"
+  end,
+  provider = function()
+    local filename = vim.api.nvim_buf_get_name(0)
+    return vim.fn.fnamemodify(filename, ":t")
+  end,
+  hl = { fg = colors.blue },
 }
 
 -- Cursor position: Ruler
 --local Ruler = {
-	-- %l = current line number
-	-- %L = number of lines in the buffer
-	-- %c = column number
-	-- %P = percentage through file of displayed window
-	--provider = "%P %(%l/%L%):%c ",
-	--provider = "%3(%2l%):%c %P ",
-	--provider = "%7(%l/%3L%):%2c%P ",
-	--provider = "%3(%P%)",
-	--provider = "%7(%l/%3L%):%2c %P",
-	--provider = "%7 %p%% Ln %l, Col %c",
-	--provider = "%9( %P %2l/%L :%2c %)",
-	--provider = "%9(%2l%2( : %c%)/%L %P %)",
-	--provider = "%7(%l:%c/%L%) ",
-	--provider = "%6(%l:%1.5c/%L%) %P ",
-	--provider = "%6(%l:%1.5c/%L%) ",
-	--provider = "%3(%l:%1.5c/%L%)  ",
-	--provider = "%7(%l/%3L%):%2c ",
+-- %l = current line number
+-- %L = number of lines in the buffer
+-- %c = column number
+-- %P = percentage through file of displayed window
+--provider = "%P %(%l/%L%):%c ",
+--provider = "%3(%2l%):%c %P ",
+--provider = "%7(%l/%3L%):%2c%P ",
+--provider = "%3(%P%)",
+--provider = "%7(%l/%3L%):%2c %P",
+--provider = "%7 %p%% Ln %l, Col %c",
+--provider = "%9( %P %2l/%L :%2c %)",
+--provider = "%9(%2l%2( : %c%)/%L %P %)",
+--provider = "%7(%l:%c/%L%) ",
+--provider = "%6(%l:%1.5c/%L%) %P ",
+--provider = "%6(%l:%1.5c/%L%) ",
+--provider = "%3(%l:%1.5c/%L%)  ",
+--provider = "%7(%l/%3L%):%2c ",
 --	provider = "%7(%l:%c%) ",
-	--provider = "%l:%c ",
-	--hl = { fg = utils.get_highlight("Statusline").fg, bold = true },
+--provider = "%l:%c ",
+--hl = { fg = utils.get_highlight("Statusline").fg, bold = true },
 --	hl = { fg = colors.darkgray, bold = true },
 --}
 local leftruler = { Space, Align }
 local rightruler = { Align, Space }
 local cursor_location = {
   --{ provider = "", hl = { fg = utils.get_highlight("StatusLine").bg, bold = true } },
---	{ provider = "%<%-05.10(%l:%c%)", hl = { fg = colors.darkgray, bold = true } },
---	{ provider = "  ", hl = { fg = colors.darkgray, bold = true } },
+  --	{ provider = "%<%-05.10(%l:%c%)", hl = { fg = colors.darkgray, bold = true } },
+  --	{ provider = "  ", hl = { fg = colors.darkgray, bold = true } },
   --{ provider = "%P %=%<%(%l,%c)" },
   --{ provider = "   %w%-8.(%l,%c%)%>" },
   { provider = " %1(%4l:%-3(%c%) %)%*", hl = { fg = colors.black, bold = true } },
 }
 local Ruler = { cursor_location }
 
-	--utils.make_flexible_component(
-	--	3,
-	--	{ Ruler, hl = { fg = utils.get_highlight("statusline").bg, force = true } },
-	--	{ provider = "%<" }
-	--),
+--utils.make_flexible_component(
+--	3,
+--	{ Ruler, hl = { fg = utils.get_highlight("statusline").bg, force = true } },
+--	{ provider = "%<" }
+--),
 --local cursor_location = {
 --	{ provider = "%7(%l:%c%) ", hl = { bold = true } },
 --	{
@@ -613,51 +613,51 @@ local Ruler = { cursor_location }
 --}
 
 local WordCount = {
-	condition = function()
-		return conditions.buffer_matches({
-			filetype = {
-				"markdown",
-				"txt",
-				"vimwiki",
-			},
-		})
-	end,
-	Space,
-	{
-		provider = function()
-			return "W:" .. vim.fn.wordcount().words
-		end,
-	},
+  condition = function()
+    return conditions.buffer_matches({
+      filetype = {
+        "markdown",
+        "txt",
+        "vimwiki",
+      },
+    })
+  end,
+  Space,
+  {
+    provider = function()
+      return "W:" .. vim.fn.wordcount().words
+    end,
+  },
 }
 
 -- Working Directory
 local WorkDir = {
-    init = function(self)
-        self.icon = (vim.fn.haslocaldir(0) == 1 and "l" or "g") .. " " .. " "
-        local cwd = vim.fn.getcwd(0)
-        self.cwd = vim.fn.fnamemodify(cwd, ":~")
+  init = function(self)
+    self.icon = (vim.fn.haslocaldir(0) == 1 and "l" or "g") .. " " .. " "
+    local cwd = vim.fn.getcwd(0)
+    self.cwd = vim.fn.fnamemodify(cwd, ":~")
+  end,
+  hl = { fg = "colors.blue", bold = true },
+  flexible = 1,
+  {
+    -- evaluates to the full-lenth path
+    provider = function(self)
+      local trail = self.cwd:sub(-1) == "/" and "" or "/"
+      return self.icon .. self.cwd .. trail .. " "
     end,
-    hl = { fg = "colors.blue", bold = true },
-    flexible = 1,
-    {
-        -- evaluates to the full-lenth path
-        provider = function(self)
-            local trail = self.cwd:sub(-1) == "/" and "" or "/"
-            return self.icon .. self.cwd .. trail .." "
-        end,
-    },
-    {
-        -- evaluates to the shortened path
-        provider = function(self)
-            local cwd = vim.fn.pathshorten(self.cwd)
-            local trail = self.cwd:sub(-1) == "/" and "" or "/"
-            return self.icon .. cwd .. trail .. " "
-        end,
-    },
-    {
-        -- evaluates to "", hiding the component
-        provider = "",
-    }
+  },
+  {
+    -- evaluates to the shortened path
+    provider = function(self)
+      local cwd = vim.fn.pathshorten(self.cwd)
+      local trail = self.cwd:sub(-1) == "/" and "" or "/"
+      return self.icon .. cwd .. trail .. " "
+    end,
+  },
+  {
+    -- evaluates to "", hiding the component
+    provider = "",
+  }
 }
 
 -- Snippets Indicator
@@ -677,26 +677,26 @@ local WorkDir = {
 
 -- let's add the children to our FileNameBlock component
 FileNameBlock = utils.insert(
-	FileNameBlock,
-	FileIcon,
-	utils.insert(FileNameModifier, FileName), -- a new table where FileName is a child of FileNameModifier
-	unpack(FileFlags), -- A small optimisation, since their parent does nothing
-	{ provider = "%<" } -- this means that the statusline is cut here when there's not enough space
+  FileNameBlock,
+  FileIcon,
+  utils.insert(FileNameModifier, FileName), -- a new table where FileName is a child of FileNameModifier
+  unpack(FileFlags),                       -- A small optimisation, since their parent does nothing
+  { provider = "%<" }                      -- this means that the statusline is cut here when there's not enough space
 )
 
 local FileInfoBlock = {
-	-- let's first set up some attributes needed by this component and it's children
-	init = function(self)
-		self.filename = vim.api.nvim_buf_get_name(0)
-	end,
+  -- let's first set up some attributes needed by this component and it's children
+  init = function(self)
+    self.filename = vim.api.nvim_buf_get_name(0)
+  end,
 }
 
 FileInfoBlock = utils.insert(
-	FileInfoBlock,
-	Space,
-	FileIcon,
-	FileType,
-	{ provider = "%<" } -- this means that the statusline is cut here when there's not enough space
+  FileInfoBlock,
+  Space,
+  FileIcon,
+  FileType,
+  { provider = "%<" } -- this means that the statusline is cut here when there's not enough space
 )
 
 --ViMode = utils.surround({ "", "" }, function(self)
@@ -708,71 +708,93 @@ FileInfoBlock = utils.insert(
 --{provider = '>>>', hl = {...}}
 --}
 LeftSpace = utils.surround({ "", " " }, function(self)
-	return self:mode_color()
+  return self:mode_color()
 end, { LeftSpace, hl = { fg = utils.get_highlight("statusline").bg, force = true } })
 
-RightSpace = utils.surround(
-	{ "", "" },
-	colors.gray,
-	{ RightSpace, hl = { bg = utils.get_highlight("statusline").bg, force = true } }
-)
+RightSpace = utils.surround({ "", "" }, function(self)
+  return self:mode_color()
+end, { RightSpace, hl = { bg = utils.get_highlight("statusline").bg, force = true } })
+--RightSpace = utils.surround(
+--  { "", "" },
+--  colors.gray,
+--  { RightSpace, hl = { bg = utils.get_highlight("statusline").bg, force = true } }
+--)
 
 RightSpace2 = utils.surround(
-	{ "█", "" },
-	colors.darkgray,
-	{ RightSpace2, hl = { fg = colors.darkgray, force = true } }
+  { "█", "" },
+  colors.darkgray,
+  { RightSpace2, hl = { fg = colors.darkgray, force = true } }
 )
 
 RightSpace3 = utils.surround(
-	{ "█", "" },
-	utils.get_highlight("statusline").bg,
-	{ RightSpace3, hl = { fg = colors.darkgray, force = true } }
+  { "█", "" },
+  utils.get_highlight("statusline").bg,
+  { RightSpace3, hl = { fg = colors.darkgray, force = true } }
+)
+
+RightSpace4 = utils.surround(
+  { "█", "" },
+  utils.get_highlight("statusline").bg,
+  { RightSpace4, hl = { fg = colors.nobg, force = true } }
 )
 
 LSPActive = utils.surround({ "", "" }, function(self)
-	return self:mode_color()
+  return self:mode_color()
 end, { Space, LSPActive, hl = { bg = colors.darkgray, force = true } })
 
 FileInfoBlock = utils.surround({ "", "" }, function(self)
-	return self:mode_color()
+  return self:mode_color()
 end, { FileInfoBlock, Space, hl = { bg = colors.gray, force = true } })
 
 Ruler = utils.surround({ "", "" }, colors.gray, { Ruler, hl = { fg = colors.gray, force = true } })
 
 local left = {
-	{ ViMode, hl = { fg = utils.get_highlight("statusline").bg, force = true } },
-	--{ LeftSep, hl = function(self)
+  { ViMode,        hl = { fg = utils.get_highlight("statusline").bg, force = true } },
+  --{ LeftSep, hl = function(self)
   --      return { fg = self.mode_colors[self.mode], bg = utils.get_highlight("statusline").bg, bold = true, }
   --  end,
   --},
-	{ LeftSpace, hl = { bg = utils.get_highlight("statusline").bg, force = true } },
-	{ FileNameBlock, hl = { bg = utils.get_highlight("statusline").bg, force = true } },
-	{ Space, hl = { bg = utils.get_highlight("statusline").bg, force = true } },
-	{ Git, hl = { bg = utils.get_highlight("statusline").bg, force = true } },
+  --{ LeftSpace, hl = { bg = utils.get_highlight("statusline").bg, force = true } },
+  { LeftSpace,     hl = { bg = colors.nobg, force = true } },
+  { FileNameBlock, hl = { bg = colors.nobg, force = true } },
+  { Space,         hl = { bg = colors.nobg, force = true } },
+  { Git,           hl = { bg = colors.nobg, force = true } },
 }
 local middle = {
-	{ Align, hl = { bg = utils.get_highlight("statusline").bg, force = true } },
-	--{ Navic, hl = { bg = utils.get_highlight("statusline").bg, force = true } },
-	{ DAPMessages, hl = { bg = utils.get_highlight("statusline").bg, force = true } },
-	{ Align, hl = { bg = utils.get_highlight("statusline").bg, force = true } },
+  { Align,       hl = { bg = colors.nobg, force = true } },
+  --{ Navic, hl = { bg = utils.get_highlight("statusline").bg, force = true } },
+  { DAPMessages, hl = { bg = colors.nobg, force = true } },
+  { Align,       hl = { bg = colors.nobg, force = true } },
 }
 local right = {
-	{ Diagnostics, hl = { bg = utils.get_highlight("statusline").bg, force = true } },
-	{
-		RightSpace3,
-		hl = { bg = colors.darkgray, force = true },
-	},
-	{ LSPActive, hl = { bg = colors.darkgray, force = true } },
-	{ RightSpace2, hl = { bg = colors.gray, force = true } },
-	{ FileInfoBlock, hl = { bg = colors.gray, force = true } },
-	{ RightSpace, hl = { fg = colors.gray, force = true } },
-	--{ cursor_location, hl = { fg = utils.get_highlight("statusline").bg, force = true } },
-	{ Ruler, hl = { fg = utils.get_highlight("statusline").bg, force = true } },
-	--utils.make_flexible_component(
-	--	3,
-	--	{ Ruler, hl = { fg = utils.get_highlight("statusline").bg, force = true } },
-	--	{ provider = "%<" }
-	--),
+  { Space,         hl = { bg = colors.nobg, force = true } },
+  { Diagnostics,   hl = { bg = colors.nobg, force = true } },
+  { Space,         hl = { bg = colors.nobg, force = true } },
+  --{ RightSep, hl = { fg = colors.nobg, bg = colors.nobg, force = true } },
+  --{ RightSep, hl = { fg = colors.darkgray, bg = colors.nobg, force = true } },
+  --{
+  --	RightSpace4,
+  --	hl = { bg = colors.darkgray, force = true },
+  --},
+  { LSPActive,     hl = { bg = colors.nobg, force = true } },
+  { Space,         hl = { bg = colors.nobg, force = true } },
+  --{ LSPActive, hl = { bg = colors.darkgray, force = true } },
+  --{ RightSpace2, hl = { bg = colors.nobg, force = true } },
+  --{ RightSpace2, hl = { bg = colors.gray, force = true } },
+  { FileInfoBlock, hl = { bg = colors.nobg, force = true } },
+  --{ FileInfoBlock, hl = { bg = colors.gray, force = true } },
+  --{ RightSep,     hl = { bg = colors.nobg, force = true } },
+  --{ RightSpace,    hl = { bg = colors.nobg, force = true } },
+  --{ RightSpace, hl = { fg = colors.gray, force = true } },
+  --{ RightSpace, hl = { bg = colors.nobg, force = true } },
+  { RightSpace,         hl = { bg = colors.nobg, fg = utils.get_highlight("statusline").bg, force = true } },
+  --{ cursor_location, hl = { fg = utils.get_highlight("statusline").bg, force = true } },
+  { Ruler,         hl = { fg = utils.get_highlight("statusline").bg, force = true } },
+  --utils.make_flexible_component(
+  --	3,
+  --	{ Ruler, hl = { fg = utils.get_highlight("statusline").bg, force = true } },
+  --	{ provider = "%<" }
+  --),
 }
 --local Align = { provider = "%=", hl = { bg = colors.bg } }
 
@@ -781,95 +803,90 @@ local DefaultStatusline = { sections }
 --LSPActive, Space, LSPMessages, Space, UltTest, Space, FileType, Space, Ruler, Space, ScrollBar
 
 local InactiveStatusline = {
-	condition = conditions.is_not_active,
-	{ FileType, hl = { bg = utils.get_highlight("statusline").bg, force = true } },
-	{ Space, hl = { bg = utils.get_highlight("statusline").bg, force = true } },
-	{ FileName, hl = { bg = utils.get_highlight("statusline").bg, force = true } },
-	{ Align, hl = { bg = utils.get_highlight("statusline").bg, force = true } },
+  condition = conditions.is_not_active,
+  { FileType, hl = { bg = utils.get_highlight("statusline").bg, force = true } },
+  { Space,    hl = { bg = utils.get_highlight("statusline").bg, force = true } },
+  { FileName, hl = { bg = utils.get_highlight("statusline").bg, force = true } },
+  { Align,    hl = { bg = utils.get_highlight("statusline").bg, force = true } },
 }
 
 local SpecialStatusline = {
-	condition = function()
-		return conditions.buffer_matches({
-			buftype = { "nofile", "prompt", "help", "quickfix" },
-			filetype = { "^git.*", "fugitive", "dashboard", },
-		})
-	end,
-
-	--FileType,
-	--Space,
-	--Align,
-	{ ViMode, hl = { fg = utils.get_highlight("statusline").bg, force = true } },
-	{ LeftSpace, hl = { bg = utils.get_highlight("statusline").bg, force = true } },
-	{ Space, hl = { bg = utils.get_highlight("statusline").bg, force = true } },
-	{ Align, hl = { bg = utils.get_highlight("statusline").bg, force = true } },
-	{ RightSpace, hl = { fg = utils.get_highlight("statusline").bg, force = true } },
-	{ Ruler, hl = { fg = utils.get_highlight("statusline").bg, force = true } },
+  condition = function()
+    return conditions.buffer_matches({
+      buftype = { "nofile", "prompt", "help", "quickfix" },
+      filetype = { "^git.*", "fugitive", "dashboard", },
+    })
+  end,
+  --FileType,
+  --Space,
+  --Align,
+  { ViMode,     hl = { fg = utils.get_highlight("statusline").bg, force = true } },
+  { LeftSpace,  hl = { bg = utils.get_highlight("statusline").bg, force = true } },
+  { Space,      hl = { bg = utils.get_highlight("statusline").bg, force = true } },
+  { Align,      hl = { bg = utils.get_highlight("statusline").bg, force = true } },
+  { RightSpace, hl = { fg = utils.get_highlight("statusline").bg, force = true } },
+  { Ruler,      hl = { fg = utils.get_highlight("statusline").bg, force = true } },
 }
 
 local TerminalStatusline = {
-
-	condition = function()
-		return conditions.buffer_matches({ buftype = { "terminal" } })
-	end,
-
-	--hl = { bg = colors.red },
-
-	-- Quickly add a condition to the ViMode to only show it when buffer is active!
-	--{ condition = conditions.is_active, ViMode, Space },
-	{ ViMode, hl = { fg = utils.get_highlight("statusline").bg, force = true } },
-	{ LeftSpace, hl = { bg = utils.get_highlight("statusline").bg, force = true } },
-	{ FileType, hl = { bg = utils.get_highlight("statusline").bg, force = true } },
-	{ Space, hl = { bg = utils.get_highlight("statusline").bg, force = true } },
-	{ Align, hl = { bg = utils.get_highlight("statusline").bg, force = true } },
-	{ RightSpace, hl = { fg = utils.get_highlight("statusline").bg, force = true } },
-	{ Ruler, hl = { fg = utils.get_highlight("statusline").bg, force = true } },
-	--FileType,
-	--Space,
-	--TerminalName,
-	--Align,
+  condition = function()
+    return conditions.buffer_matches({ buftype = { "terminal" } })
+  end,
+  --hl = { bg = colors.red },
+
+  -- Quickly add a condition to the ViMode to only show it when buffer is active!
+  --{ condition = conditions.is_active, ViMode, Space },
+  { ViMode,     hl = { fg = utils.get_highlight("statusline").bg, force = true } },
+  { LeftSpace,  hl = { bg = utils.get_highlight("statusline").bg, force = true } },
+  { FileType,   hl = { bg = utils.get_highlight("statusline").bg, force = true } },
+  { Space,      hl = { bg = utils.get_highlight("statusline").bg, force = true } },
+  { Align,      hl = { bg = utils.get_highlight("statusline").bg, force = true } },
+  { RightSpace, hl = { fg = utils.get_highlight("statusline").bg, force = true } },
+  { Ruler,      hl = { fg = utils.get_highlight("statusline").bg, force = true } },
+  --FileType,
+  --Space,
+  --TerminalName,
+  --Align,
 }
 
 local StatusLine = {
-
-	--hl = function()
-	--	if conditions.is_active() then
-	--		return "StatusLine"
-	--	else
-	--		return "StatusLineNC"
-	--	end
-	--end,
-	static = {
-		mode_colors = {
-			n = colors.blue,
-			i = colors.green,
-			v = colors.purple,
-			V = colors.purple,
-			["\22"] = colors.purple,
-			c = colors.orange,
-			s = colors.purple,
-			S = colors.purple,
-			["\19"] = colors.purple,
-			R = colors.red,
-			r = colors.red,
-			["!"] = colors.orange,
-			t = colors.orange,
-		},
-		mode_color = function(self)
-			local mode = conditions.is_active() and vim.fn.mode() or "n"
-			return self.mode_colors[mode]
-		end,
-		hl = function(self)
-			local color = self:mode_color() -- here!
-			return { bg = color }
-		end,
-	},
-	fallthrough = false,
-
-	SpecialStatusline,
-	TerminalStatusline,
-	InactiveStatusline,
-	DefaultStatusline,
+  --hl = function()
+  --	if conditions.is_active() then
+  --		return "StatusLine"
+  --	else
+  --		return "StatusLineNC"
+  --	end
+  --end,
+  static = {
+    mode_colors = {
+      n = colors.blue,
+      i = colors.green,
+      v = colors.purple,
+      V = colors.purple,
+      ["\22"] = colors.purple,
+      c = colors.orange,
+      s = colors.purple,
+      S = colors.purple,
+      ["\19"] = colors.purple,
+      R = colors.red,
+      r = colors.red,
+      ["!"] = colors.orange,
+      t = colors.orange,
+    },
+    mode_color = function(self)
+      local mode = conditions.is_active() and vim.fn.mode() or "n"
+      return self.mode_colors[mode]
+    end,
+    hl = function(self)
+      local color = self:mode_color() -- here!
+      return { bg = color }
+    end,
+  },
+  fallthrough = false,
+  SpecialStatusline,
+  TerminalStatusline,
+  InactiveStatusline,
+  DefaultStatusline,
 }
 
 
@@ -877,11 +894,11 @@ local StatusLine = {
 --- WinBar
 --
 local WinbarFileNameBlock = {
-	-- let's first set up some attributes needed by this component and it's children
-	init = function(self)
-		self.filename = vim.api.nvim_buf_get_name(0)
-	end,
-	hl = { bg = colors.bg },
+  -- let's first set up some attributes needed by this component and it's children
+  init = function(self)
+    self.filename = vim.api.nvim_buf_get_name(0)
+  end,
+  hl = { bg = colors.bg },
 }
 
 --local WinbarFileName = {
@@ -896,112 +913,115 @@ local WinbarFileNameBlock = {
 --	end,
 --}
 local WinbarFileName = {
-	provider = function(self)
-		-- first, trim the pattern relative to the current directory. For other
-		-- options, see :h filename-modifers
-		local filename = vim.fn.fnamemodify(self.filename, ":.")
-		if filename == "" then
-			return "No Name"
-		end
-		-- now, if the filename would occupy more than 1/4th of the available
-		-- space, we trim the file path to its initials
-		-- See Flexible Components section below for dynamic truncation
-		if not conditions.width_percent_below(#filename, 0.25) then
-			filename = vim.fn.pathshorten(filename)
-		end
-		return filename
-	end,
-	--hl = { fg = utils.get_highlight("Statusline").fg, bold = false, bg = colors.bg },
-	hl = { fg = colors.gray, bold = false, bg = colors.bg },
+  provider = function(self)
+    -- first, trim the pattern relative to the current directory. For other
+    -- options, see :h filename-modifers
+    local filename = vim.fn.fnamemodify(self.filename, ":.")
+    if filename == "" then
+      return "No Name"
+    end
+    -- now, if the filename would occupy more than 1/4th of the available
+    -- space, we trim the file path to its initials
+    -- See Flexible Components section below for dynamic truncation
+    if not conditions.width_percent_below(#filename, 0.25) then
+      filename = vim.fn.pathshorten(filename)
+    end
+    return filename
+  end,
+  --hl = { fg = utils.get_highlight("Statusline").fg, bold = false, bg = colors.bg },
+  hl = { fg = colors.gray, bold = false, bg = colors.bg },
 }
 
 WinbarFileNameBlock = utils.insert(
-	WinbarFileNameBlock,
-	FileIcon,
-	utils.insert(WinbarFileName), -- a new table where FileName is a child of FileNameModifier
-	unpack(FileFlags), -- A small optimisation, since their parent does nothing
-	{ provider = "%<" } -- this means that the statusline is cut here when there's not enough space
+  WinbarFileNameBlock,
+  FileIcon,
+  utils.insert(WinbarFileName), -- a new table where FileName is a child of FileNameModifier
+  unpack(FileFlags),           -- A small optimisation, since their parent does nothing
+  { provider = "%<" }          -- this means that the statusline is cut here when there's not enough space
 )
 
 vim.api.nvim_create_autocmd("User", {
-	pattern = "HeirlineInitWinbar",
-	callback = function(args)
-		local buf = args.buf
-		local buftype = vim.tbl_contains({ "prompt", "nofile", "help", "quickfix" }, vim.bo[buf].buftype)
-		local filetype = vim.tbl_contains({ "gitcommit", "fugitive" }, vim.bo[buf].filetype)
-		if buftype or filetype then
-			vim.opt_local.winbar = nil
-		end
-	end,
+  pattern = "HeirlineInitWinbar",
+  callback = function(args)
+    local buf = args.buf
+    local buftype = vim.tbl_contains({ "prompt", "nofile", "help", "quickfix" }, vim.bo[buf].buftype)
+    local filetype = vim.tbl_contains({ "gitcommit", "fugitive" }, vim.bo[buf].filetype)
+    if buftype or filetype then
+      vim.opt_local.winbar = nil
+    end
+  end,
 })
 
 On_click = {
-	-- get the window id of the window in which the component was evaluated
-	minwid = function()
-		return vim.api.nvim_get_current_win()
-	end,
-	callback = function(_, minwid)
-		-- winid is the window id of the window the component was clicked from
-		local winid = minwid
-		-- do something with the window id, e.g.:
-		local buf = vim.api.nvim_win_get_buf(winid)
-		-- ...
-	end,
+  -- get the window id of the window in which the component was evaluated
+  minwid = function()
+    return vim.api.nvim_get_current_win()
+  end,
+  callback = function(_, minwid)
+    -- winid is the window id of the window the component was clicked from
+    local winid = minwid
+    -- do something with the window id, e.g.:
+    local buf = vim.api.nvim_win_get_buf(winid)
+    -- ...
+  end,
 }
 
 local CloseButton = {
-	condition = function(self)
-		return not vim.bo.modified
-	end,
-	-- a small performance improvement:
-	-- re register the component callback only on layout/buffer changes.
-	update = { "WinNew", "WinClosed", "BufEnter" },
-	{ provider = " " },
-	{
-		provider = "",
-		hl = { fg = "gray" },
-		On_click = {
-			minwid = function()
-				return vim.api.nvim_get_current_win()
-			end,
-			callback = function(_, minwid)
-				vim.api.nvim_win_close(minwid, true)
-			end,
-			name = "heirline_winbar_close_button",
-		},
-	},
+  condition = function(self)
+    return not vim.bo.modified
+  end,
+  -- a small performance improvement:
+  -- re register the component callback only on layout/buffer changes.
+  update = { "WinNew", "WinClosed", "BufEnter" },
+  { provider = " " },
+  {
+    provider = "",
+    hl = { fg = "gray" },
+    On_click = {
+      minwid = function()
+        return vim.api.nvim_get_current_win()
+      end,
+      callback = function(_, minwid)
+        vim.api.nvim_win_close(minwid, true)
+      end,
+      name = "heirline_winbar_close_button",
+    },
+  },
 }
 
 local Center = {
-	fallthrough = false,
-	{ -- Hide the winbar for special buffers
-		condition = function()
-			return conditions.buffer_matches({
-				buftype = { "nofile", "prompt", "help", "quickfix" },
-				filetype = { "^git.*", "fugitive", "dashboard", },
-			})
-		end,
-		init = function()
-			vim.opt_local.winbar = nil
-		end,
-	},
-	{ -- A special winbar for terminals
-		condition = function()
-			return conditions.buffer_matches({ buftype = { "terminal" } })
-		end,
-		FileType,
-		Space,
-		--TerminalName,
-	},
-	{ -- An inactive winbar for regular files
-		condition = function()
-			return not conditions.is_active()
-		end,
-		--utils.surround({ "", "" }, colors.nobg, { FileIcon, { WinbarFileName, hl = { fg = colors.gray } }, FileFlags } ),
-		utils.surround({ "", "" }, colors.nobg, { WinbarFileNameBlock } ),
-	},
-	-- A winbar for regular files
-	utils.surround({ "", "" }, colors.nobg, { FileNameBlock }),
+  fallthrough = false,
+  {
+   -- Hide the winbar for special buffers
+    condition = function()
+      return conditions.buffer_matches({
+        buftype = { "nofile", "prompt", "help", "quickfix" },
+        filetype = { "^git.*", "fugitive", "dashboard", },
+      })
+    end,
+    init = function()
+      vim.opt_local.winbar = nil
+    end,
+  },
+  {
+   -- A special winbar for terminals
+    condition = function()
+      return conditions.buffer_matches({ buftype = { "terminal" } })
+    end,
+    FileType,
+    Space,
+    --TerminalName,
+  },
+  {
+   -- An inactive winbar for regular files
+    condition = function()
+      return not conditions.is_active()
+    end,
+    --utils.surround({ "", "" }, colors.nobg, { FileIcon, { WinbarFileName, hl = { fg = colors.gray } }, FileFlags } ),
+    utils.surround({ "", "" }, colors.nobg, { WinbarFileNameBlock }),
+  },
+  -- A winbar for regular files
+  utils.surround({ "", "" }, colors.nobg, { FileNameBlock }),
 }
 
 --local WinBar = { Align, Center, Align }
@@ -1019,195 +1039,193 @@ local WinBar = { Space, Center }
 
 -- we redefine the filename component, as we probably only want the tail and not the relative path
 local TablineFileName = {
-	provider = function(self)
-		-- self.filename will be defined later, just keep looking at the example!
-		local filename = self.filename
-		filename = filename == "" and "No Name" or vim.fn.fnamemodify(filename, ":t")
-		return filename
-	end,
-	hl = function(self)
-		return { fg = colors.white, bold = self.is_active or self.is_visible, italic = true }
-	end,
+  provider = function(self)
+    -- self.filename will be defined later, just keep looking at the example!
+    local filename = self.filename
+    filename = filename == "" and "No Name" or vim.fn.fnamemodify(filename, ":t")
+    return filename
+  end,
+  hl = function(self)
+    return { fg = colors.white, bold = self.is_active or self.is_visible, italic = true }
+  end,
 }
 
 local TablineFileFlags = {
-	{
-		provider = function(self)
-			if vim.bo[self.bufnr].modified then
-				return " [+] "
-			end
-		end,
-		hl = { fg = colors.green },
-	},
-	{
-		provider = function(self)
-			if not vim.bo[self.bufnr].modifiable or vim.bo[self.bufnr].readonly then
-				return "  "
-			end
-		end,
-		hl = { fg = "orange" },
-	},
+  {
+    provider = function(self)
+      if vim.bo[self.bufnr].modified then
+        return " [+] "
+      end
+    end,
+    hl = { fg = colors.green },
+  },
+  {
+    provider = function(self)
+      if not vim.bo[self.bufnr].modifiable or vim.bo[self.bufnr].readonly then
+        return "  "
+      end
+    end,
+    hl = { fg = "orange" },
+  },
 }
 
 local TablineFileIcon = {
-	init = function(self)
-		local filename = self.filename
-		local extension = vim.fn.fnamemodify(filename, ":e")
-		self.icon, self.icon_color =
-			require("nvim-web-devicons").get_icon_color(filename, extension, { default = true })
-	end,
-	provider = function(self)
-		return self.icon and (" " .. self.icon .. " ")
-	end,
-	hl = function(self)
-		return { fg = self.icon_color }
-	end,
+  init = function(self)
+    local filename = self.filename
+    local extension = vim.fn.fnamemodify(filename, ":e")
+    self.icon, self.icon_color =
+        require("nvim-web-devicons").get_icon_color(filename, extension, { default = true })
+  end,
+  provider = function(self)
+    return self.icon and (" " .. self.icon .. " ")
+  end,
+  hl = function(self)
+    return { fg = self.icon_color }
+  end,
 }
 
 -- Here the filename block finally comes together
 local TablineFileNameBlock = {
-	init = function(self)
-		self.filename = vim.api.nvim_buf_get_name(self.bufnr)
-	end,
-	hl = function(self)
-		if self.is_active then
-			return "TabLineSel"
-		-- why not?
-		--elseif not vim.api.nvim_buf_is_loaded(self.bufnr) then
-		--return { fg = "gray", bg = colors.bg }
-		else
-			return "TabLineFill"
-		end
-	end,
-	on_click = {
-		callback = function(_, minwid, _, button)
-			if button == "m" then -- close on mouse middle click
-				vim.api.nvim_buf_delete(minwid, { force = false })
-			else
-				vim.api.nvim_win_set_buf(0, minwid)
-			end
-		end,
-		minwid = function(self)
-			return self.bufnr
-		end,
-		name = "heirline_tabline_buffer_callback",
-	},
-	--TablineBufnr,
-	TablineFileIcon,
-	TablineFileName,
-	TablineFileFlags,
+  init = function(self)
+    self.filename = vim.api.nvim_buf_get_name(self.bufnr)
+  end,
+  hl = function(self)
+    if self.is_active then
+      return "TabLineSel"
+      -- why not?
+      --elseif not vim.api.nvim_buf_is_loaded(self.bufnr) then
+      --return { fg = "gray", bg = colors.bg }
+    else
+      return "TabLineFill"
+    end
+  end,
+  on_click = {
+    callback = function(_, minwid, _, button)
+      if button == "m" then -- close on mouse middle click
+        vim.api.nvim_buf_delete(minwid, { force = false })
+      else
+        vim.api.nvim_win_set_buf(0, minwid)
+      end
+    end,
+    minwid = function(self)
+      return self.bufnr
+    end,
+    name = "heirline_tabline_buffer_callback",
+  },
+  --TablineBufnr,
+  TablineFileIcon,
+  TablineFileName,
+  TablineFileFlags,
 }
 
 -- a nice "x" button to close the buffer
 local TablineCloseButton = {
-	condition = function(self)
-		return not vim.api.nvim_buf_get_option(self.bufnr, "modified")
-	end,
-	{ provider = " " },
-	{
-		provider = " ",
-		--hl = { fg = "red", bg = colors.bg },
-		hl = { fg = colors.red },
-		on_click = {
-			callback = function(_, minwid)
-				vim.api.nvim_buf_delete(minwid, { force = false })
-			end,
-			minwid = function(self)
-				return self.bufnr
-			end,
-			name = "heirline_tabline_close_buffer_callback",
-		},
-	},
+  condition = function(self)
+    return not vim.api.nvim_buf_get_option(self.bufnr, "modified")
+  end,
+  { provider = " " },
+  {
+    provider = " ",
+    --hl = { fg = "red", bg = colors.bg },
+    hl = { fg = colors.red },
+    on_click = {
+      callback = function(_, minwid)
+        vim.api.nvim_buf_delete(minwid, { force = false })
+      end,
+      minwid = function(self)
+        return self.bufnr
+      end,
+      name = "heirline_tabline_close_buffer_callback",
+    },
+  },
 }
 
 -- The final touch!
 local TablineBufferBlock = utils.surround({ "", "" }, function(self)
-	--local TablineBufferBlock = utils.surround({ "█", "█" }, function(self)
-	if self.is_active then
-		return utils.get_highlight("TabLineSel").bg
-	else
-		return utils.get_highlight("TabLineFill").bg
-	end
+  --local TablineBufferBlock = utils.surround({ "█", "█" }, function(self)
+  if self.is_active then
+    return utils.get_highlight("TabLineSel").bg
+  else
+    return utils.get_highlight("TabLineFill").bg
+  end
 end, { Tab, TablineFileNameBlock, TablineCloseButton })
 
 local BufferLine = utils.make_buflist(
-	TablineBufferBlock,
-	{ provider = "􀰎 ", hl = { fg = colors.white } }, -- left truncation, optional (defaults to "<")
-	{ provider = " 􀰓", hl = { fg = colors.white } } -- right trunctation, also optional (defaults to ...... yep, ">")
-	-- by the way, open a lot of buffers and try clicking them ;)
+  TablineBufferBlock,
+  { provider = "􀰎 ", hl = { fg = colors.white } }, -- left truncation, optional (defaults to "<")
+  { provider = " 􀰓", hl = { fg = colors.white } } -- right trunctation, also optional (defaults to ...... yep, ">")
+-- by the way, open a lot of buffers and try clicking them ;)
 )
 -- TabList
 local Tabpage = {
-	provider = function(self)
-		return "%" .. self.tabnr .. "T " .. self.tabnr .. " %T"
-	end,
-	hl = function(self)
-		if not self.is_active then
-			return "TabLineFill"
-		else
-			return "TabLineSel"
-		end
-	end,
+  provider = function(self)
+    return "%" .. self.tabnr .. "T " .. self.tabnr .. " %T"
+  end,
+  hl = function(self)
+    if not self.is_active then
+      return "TabLineFill"
+    else
+      return "TabLineSel"
+    end
+  end,
 }
 
 local TabpageClose = {
-	provider = "%999X  %X",
-	--hl = "TabLine",
-	hl = { fg = colors.red, bg = colors.bg },
+  provider = "%999X  %X",
+  --hl = "TabLine",
+  hl = { fg = colors.red, bg = colors.bg },
 }
 
 local TabPages = {
-	-- only show this component if there's 2 or more tabpages
-	condition = function()
-		return #vim.api.nvim_list_tabpages() >= 2
-	end,
-	{
-		provider = "%=",
-	},
-	utils.make_tablist(Tabpage),
-	TabpageClose,
+  -- only show this component if there's 2 or more tabpages
+  condition = function()
+    return #vim.api.nvim_list_tabpages() >= 2
+  end,
+  {
+    provider = "%=",
+  },
+  utils.make_tablist(Tabpage),
+  TabpageClose,
 }
 
 -- TabLineOffset
 local TabLineOffset = {
-	condition = function(self)
-		local win = vim.api.nvim_tabpage_list_wins(0)[1]
-		local bufnr = vim.api.nvim_win_get_buf(win)
-		self.winid = win
-
-		if vim.api.nvim_buf_get_option(bufnr, "filetype") == "NvimTree" then
-			self.title = "NvimTree"
-			return true
-		end
-	end,
-
-	provider = function(self)
-		local title = self.title
-		local width = vim.api.nvim_win_get_width(self.winid)
-		local pad = math.ceil((width - #title) / 2)
-		return string.rep(" ", pad) .. title .. string.rep(" ", pad)
-	end,
-
-	hl = function(self)
-		if vim.api.nvim_get_current_win() == self.winid then
-			return "TablineSel"
-		else
-			return "TablineFill"
-		end
-	end,
+  condition = function(self)
+    local win = vim.api.nvim_tabpage_list_wins(0)[1]
+    local bufnr = vim.api.nvim_win_get_buf(win)
+    self.winid = win
+
+    if vim.api.nvim_buf_get_option(bufnr, "filetype") == "NvimTree" then
+      self.title = "NvimTree"
+      return true
+    end
+  end,
+  provider = function(self)
+    local title = self.title
+    local width = vim.api.nvim_win_get_width(self.winid)
+    local pad = math.ceil((width - #title) / 2)
+    return string.rep(" ", pad) .. title .. string.rep(" ", pad)
+  end,
+  hl = function(self)
+    if vim.api.nvim_get_current_win() == self.winid then
+      return "TablineSel"
+    else
+      return "TablineFill"
+    end
+  end,
 }
 
 local TabLine = {
-	TabLineOffset,
-	BufferLine,
-	TabPages,
+  TabLineOffset,
+  BufferLine,
+  TabPages,
 }
 
 require("heirline").setup({
-    statusline = StatusLine,
-    winbar = WinBar,
-    tabline = TabLine,
-    --statuscolumn = StatusColumn
+  statusline = StatusLine,
+  winbar = WinBar,
+  tabline = TabLine,
+  --statuscolumn = StatusColumn
 })
 
 -- Yep, with heirline we're driving manual!
diff --git a/.config/nvim/lua/user/mods.lua b/.config/nvim/lua/user/mods.lua
index 1973868..e523eb7 100644
--- a/.config/nvim/lua/user/mods.lua
+++ b/.config/nvim/lua/user/mods.lua
@@ -183,7 +183,11 @@ local prev_cwd = ""
 
 function M.Set_git_env_vars()
   local cwd = vim.fn.getcwd()
-  if cwd ~= prev_cwd then
+  if prev_cwd == "" then
+    -- First buffer being opened, set prev_cwd to cwd
+    prev_cwd = cwd
+  elseif cwd ~= prev_cwd then
+    -- Working directory has changed since last buffer was opened
     prev_cwd = cwd
     local git_dir_job = vim.fn.jobstart({ "git", "rev-parse", "--git-dir" })
     local command_status = vim.fn.jobwait({ git_dir_job })[1]
diff --git a/.config/nvim/lua/user/pack.lua b/.config/nvim/lua/user/pack.lua
index c7c8378..951e9f7 100644
--- a/.config/nvim/lua/user/pack.lua
+++ b/.config/nvim/lua/user/pack.lua
@@ -195,6 +195,7 @@ return packer.startup(function(use)
 	use("ayu-theme/ayu-vim")
 	use("joshdick/onedark.vim")
 	use("NTBBloodbath/doom-one.nvim")
+	use("nyngwang/nvimgelion")
 
   -- UI
 	use("kyazdani42/nvim-web-devicons") --