From 399675f8b13e1e33bbcbcdd9fef69766316f4b4a Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <git-elitherl@litherlandsmith.slmail.me>
Date: Wed, 15 Feb 2023 17:29:08 +0000
Subject: [PATCH] Move location in feline to left section, set ch to 0

---
 config/nvim/lua/config/feline.lua | 35 ++++++++++++++++++++-----------
 config/nvim/lua/keymaps.lua       |  3 ++-
 config/nvim/lua/options.lua       |  1 +
 config/nvim/lua/plugins.lua       |  1 +
 4 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/config/nvim/lua/config/feline.lua b/config/nvim/lua/config/feline.lua
index 875a52e2..4eeae670 100644
--- a/config/nvim/lua/config/feline.lua
+++ b/config/nvim/lua/config/feline.lua
@@ -1,17 +1,28 @@
 local components = require("catppuccin.groups.integrations.feline").get()
-local original_provider = components.active[2][1].provider
-components.active[2][1].provider = function()
-	local sources = {
-		original_provider(),
-		require("nvim-treesitter").statusline(),
-	}
-	for _, message in pairs(sources) do
-		if message ~= "" then
-			return message
+-- local original_provider = components.active[2][1].provider
+-- components.active[2][1].provider = function()
+-- 	local sources = {
+-- 		original_provider(),
+-- 		require("nvim-treesitter").statusline(),
+-- 	}
+-- 	for _, message in pairs(sources) do
+-- 		if message ~= "" then
+-- 			return message
+-- 		end
+-- 	end
+-- 	return ""
+-- end
+table.insert(components.active[1], 12, {
+	provider = function()
+		local pos = require("nvim-treesitter").statusline()
+		if pos and pos ~= "" then
+			return pos
 		end
-	end
-	return ""
-end
+		return ""
+	end,
+	hl = components.active[1][11].hl,
+	left_sep = components.active[1][11].left_sep,
+})
 require("feline").setup({
 	components = components,
 })
diff --git a/config/nvim/lua/keymaps.lua b/config/nvim/lua/keymaps.lua
index 706f0608..b96df181 100644
--- a/config/nvim/lua/keymaps.lua
+++ b/config/nvim/lua/keymaps.lua
@@ -7,8 +7,9 @@ vim.keymap.set({ "n", "t" }, "<A-j>", "<CMD>NavigatorDown<CR>")
 vim.keymap.set({ "n", "t" }, "<A-p>", "<CMD>NavigatorPrevious<CR>")
 
 -- Telescope
-vim.keymap.set("n", "<leader>;", "<cmd>Telescope builtin<cr>")
+vim.keymap.set("n", "<leader>f;", "<cmd>Telescope builtin<cr>")
 vim.keymap.set("n", "<leader>ff", "<cmd>Telescope find_files<cr>")
+vim.keymap.set("n", "<leader>fb", "<cmd>Telescope buffers<cr>")
 vim.keymap.set("n", "<leader>fg", "<cmd>Telescope live_grep<cr>")
 vim.keymap.set("n", "<leader>fp", "<cmd>Telescope projects<cr>")
 vim.keymap.set("n", "<leader>fa", "<cmd>Telescope aerial<cr>")
diff --git a/config/nvim/lua/options.lua b/config/nvim/lua/options.lua
index b1d18355..9a8031b5 100644
--- a/config/nvim/lua/options.lua
+++ b/config/nvim/lua/options.lua
@@ -1,4 +1,5 @@
 vim.opt.title = true
+vim.opt.cmdheight = 0
 vim.g.python3_host_prog = "/usr/bin/python3"
 vim.g.python_indent = {
 	open_paren = "shiftwidth()",
diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua
index 2d5c7e12..3edaa997 100644
--- a/config/nvim/lua/plugins.lua
+++ b/config/nvim/lua/plugins.lua
@@ -104,6 +104,7 @@ require("packer").startup({
 		})
 		use({
 			"folke/trouble.nvim",
+			requires = "nvim-tree/nvim-web-devicons",
 			config = function()
 				require("config.trouble")
 			end,