From 7caa53711134c77453fcdce8691b1bbe43c887c9 Mon Sep 17 00:00:00 2001
From: 409 <bloecker.s@gmail.com>
Date: Mon, 5 Aug 2024 22:19:40 +0200
Subject: [PATCH] improvements: noice

---
 lua/409/plugins/git.lua        |  5 ++++-
 lua/409/plugins/navigation.lua | 33 ++++++++++++++++++++++++++-------
 lua/409/plugins/noice.lua      | 11 +++++++++--
 lua/409/plugins/theme.lua      |  6 ++++++
 4 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/lua/409/plugins/git.lua b/lua/409/plugins/git.lua
index a002eb4..d31d452 100644
--- a/lua/409/plugins/git.lua
+++ b/lua/409/plugins/git.lua
@@ -4,7 +4,10 @@ return {
 		keys = {
 			{
 				"<leader>gs",
-				":tab Git<CR>",
+				function()
+					vim.cmd("tab Git")
+				end,
+				-- ":tab Git<CR>",
 				desc = "Fugitive",
 			},
 		},
diff --git a/lua/409/plugins/navigation.lua b/lua/409/plugins/navigation.lua
index 8d28005..835af83 100644
--- a/lua/409/plugins/navigation.lua
+++ b/lua/409/plugins/navigation.lua
@@ -27,12 +27,20 @@ return {
 		keys = {
 			{
 				"<leader>pf",
-				":Telescope find_files<CR>",
+				function()
+					require("telescope.builtin").find_files({
+						prompt_title = "Find files",
+					})
+				end,
 				desc = "Find files",
 			},
 			{
 				"<leader>pw",
-				":Telescope lsp_dynamic_workspace_symbols<CR>",
+				function()
+					require("telescope.builtin").lsp_dynamic_workspace_symbols({
+						prompt_title = "Find symbols (LSP)",
+					})
+				end,
 				desc = "Find symbols (LSP)",
 			},
 			{
@@ -97,12 +105,18 @@ return {
 			},
 			{
 				"<C-p>",
-				":Telescope git_files<CR>",
+				function()
+					require("telescope.builtin").git_files({
+						prompt_title = "Find files (Git)",
+					})
+				end,
 				desc = "Find files (git)",
 			},
 			{
 				"<leader>pt",
-				":TodoTelescope<CR>",
+				function()
+					vim.cmd("TodoTelescope")
+				end,
 				desc = "Find TODOs",
 			},
 			{
@@ -130,7 +144,9 @@ return {
 			},
 			{
 				"<C-b>",
-				":Telescope buffers<CR>",
+				function()
+					require("telescope.builtin").buffers()
+				end,
 				desc = "Find buffers",
 			},
 		},
@@ -171,15 +187,18 @@ return {
 				["<C-c>"] = false,
 				["<C-l>"] = false,
 				["<C-h>"] = false,
+				["<C-p>"] = false,
 			},
 			float = {
 				border = "single",
-			}
+			},
 		},
 		keys = {
 			{
 				"<leader>pv",
-				":Oil<CR>",
+				function()
+					require("oil").open()
+				end,
 				desc = "File explorer (Oil)",
 			},
 			{
diff --git a/lua/409/plugins/noice.lua b/lua/409/plugins/noice.lua
index d43440c..a39423f 100644
--- a/lua/409/plugins/noice.lua
+++ b/lua/409/plugins/noice.lua
@@ -15,7 +15,7 @@ return {
 				},
 			},
 			presets = {
-				bottom_search = true,
+				bottom_search = false,
 				inc_rename = false,
 				lsp_doc_border = true,
 			},
@@ -39,7 +39,7 @@ return {
 				},
                 cmdline_popup = {
                     border = {
-                        style = "none"
+                        style = "single"
                     },
                 },
                 popup = {
@@ -47,6 +47,11 @@ return {
                         style = "single",
                     },
                 },
+                popupmenu = {
+                    border = {
+                        style = "single",
+                    },
+                },
                 confirm = {
                     backend = "popup",
                     border = {
@@ -55,5 +60,7 @@ return {
                 },
 			},
 		})
+
+		require("telescope").load_extension("noice")
 	end,
 }
diff --git a/lua/409/plugins/theme.lua b/lua/409/plugins/theme.lua
index ec7c3ee..c34a763 100644
--- a/lua/409/plugins/theme.lua
+++ b/lua/409/plugins/theme.lua
@@ -27,6 +27,12 @@ return {
 
             vim.api.nvim_set_hl(0, "NoiceFormatProgressTodo", { link = "Normal" })
             vim.api.nvim_set_hl(0, "NoiceFormatProgressDone", { link = "Normal" })
+
+            vim.api.nvim_set_hl(0, "NoiceCmdlinePopupBorder", { fg = catppuccin_colors.peach })
+            vim.api.nvim_set_hl(0, "NoiceCmdlineIconCmdline", { fg = catppuccin_colors.peach })
+            vim.api.nvim_set_hl(0, "NoiceCmdlineIconHelp", { fg = catppuccin_colors.blue })
+            vim.api.nvim_set_hl(0, "NoiceCmdlineIconSearch", { fg = catppuccin_colors.blue })
+            vim.api.nvim_set_hl(0, "NoiceCmdlinePopupBorderSearch", { fg = catppuccin_colors.blue })
         end
     },
 }