From 6fbba8bf3d8f284eed4e4fcea8fe72d0bb7e7352 Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko@korhonen.cc>
Date: Mon, 20 Nov 2023 21:14:45 +0200
Subject: [PATCH] Nvim: small tweaks and organizing config

---
 home/.config/nvim/lua/lsp_utils.lua        |  9 ++++-----
 home/.config/nvim/lua/plugins/emmylua.lua  |  5 -----
 home/.config/nvim/lua/plugins/gitsigns.lua |  3 +--
 home/.config/nvim/lua/plugins/noice.lua    | 13 +++++++++++++
 4 files changed, 18 insertions(+), 12 deletions(-)
 delete mode 100644 home/.config/nvim/lua/plugins/emmylua.lua

diff --git a/home/.config/nvim/lua/lsp_utils.lua b/home/.config/nvim/lua/lsp_utils.lua
index f8e46802..4eb1e5cb 100644
--- a/home/.config/nvim/lua/lsp_utils.lua
+++ b/home/.config/nvim/lua/lsp_utils.lua
@@ -4,7 +4,7 @@ local m = {}
 
 -- Maps LSP specific keybinds.
 -- This makes them only available when LSP is running
-function m.map_keys()
+local function map_keys()
   local telescope_builtin = require("telescope.builtin")
   require("which-key").register({
     g = {
@@ -42,7 +42,7 @@ function m.map_keys()
 end
 
 -- Maps keys and does other needed actions
--- when client attatches
+-- when client attaches
 function m.on_attach(client, bufnr)
   -- Attach navic if document symbols are available
   if client.server_capabilities.documentSymbolProvider then
@@ -50,7 +50,7 @@ function m.on_attach(client, bufnr)
   end
 
   -- Setup keybinds
-  m.map_keys()
+  map_keys()
 end
 
 -- Combine built-in LSP and cmp cabaibilities
@@ -62,8 +62,7 @@ function m.get_capabilities()
     require("cmp_nvim_lsp").default_capabilities()
   )
 
-  -- Neovim hasn't added foldingRange to default capabilities, users must add it manually
-  -- for ufo
+  -- Neovim hasn't added foldingRange to default capabilities, users must add it manually for ufo
   --capabilities.textDocument.foldingRange = {
   --  dynamicRegistration = false,
   --  lineFoldingOnly = true,
diff --git a/home/.config/nvim/lua/plugins/emmylua.lua b/home/.config/nvim/lua/plugins/emmylua.lua
deleted file mode 100644
index 8e4dc1ca..00000000
--- a/home/.config/nvim/lua/plugins/emmylua.lua
+++ /dev/null
@@ -1,5 +0,0 @@
--- vim api documentation for lua lsp
-return {
-  "ii14/emmylua-nvim",
-  ft = { "lua" },
-}
diff --git a/home/.config/nvim/lua/plugins/gitsigns.lua b/home/.config/nvim/lua/plugins/gitsigns.lua
index 825a414a..557c23bc 100644
--- a/home/.config/nvim/lua/plugins/gitsigns.lua
+++ b/home/.config/nvim/lua/plugins/gitsigns.lua
@@ -5,8 +5,7 @@ return {
     local gitsigns = require("gitsigns")
     gitsigns.setup()
 
-    local wk = require("which-key")
-    wk.register({
+    require("which-key").register({
       ["["] = { h = { gitsigns.prev_hunk, "Previous hunk" } },
       ["]"] = { h = { gitsigns.next_hunk, "Next hunk" } },
     })
diff --git a/home/.config/nvim/lua/plugins/noice.lua b/home/.config/nvim/lua/plugins/noice.lua
index ad653a56..9ef7a91d 100644
--- a/home/.config/nvim/lua/plugins/noice.lua
+++ b/home/.config/nvim/lua/plugins/noice.lua
@@ -18,4 +18,17 @@ return {
       lsp_doc_border = true,
     },
   },
+  config = function(_, opts)
+    local noice = require("noice")
+    noice.setup(opts)
+
+    require("which-key").register({
+      d = {
+        function()
+          vim.cmd("NoiceDismiss")
+        end,
+        "Dismiss notifications",
+      },
+    }, { prefix = "<leader>" })
+  end,
 }