diff --git a/lua/nvcommunity/completion/codeium/init.lua b/lua/nvcommunity/completion/codeium/init.lua
index 7cb8bd3..e47e82b 100644
--- a/lua/nvcommunity/completion/codeium/init.lua
+++ b/lua/nvcommunity/completion/codeium/init.lua
@@ -1,20 +1,19 @@
----@type NvPluginSpec
 local spec = {
   {
-      "hrsh7th/nvim-cmp",
-      config = function(_, opts)
-          table.insert(opts.sources, { name = "codeium" })
-          require("cmp").setup(opts)
-      end,
-      dependencies = {
-          {
-              "jcdickinson/codeium.nvim",
-              config = function()
-                  require("codeium").setup({})
-              end,
-          },
+    "hrsh7th/nvim-cmp",
+    config = function(_, opts)
+      table.insert(opts.sources, { name = "codeium" })
+      require("cmp").setup(opts)
+    end,
+    dependencies = {
+      {
+        "jcdickinson/codeium.nvim",
+        config = function()
+          require("codeium").setup {}
+        end,
       },
+    },
   },
 }
 
-return spec
\ No newline at end of file
+return spec
diff --git a/lua/nvcommunity/completion/copilot/init.lua b/lua/nvcommunity/completion/copilot/init.lua
index 4b94524..edc9c11 100644
--- a/lua/nvcommunity/completion/copilot/init.lua
+++ b/lua/nvcommunity/completion/copilot/init.lua
@@ -12,8 +12,6 @@
 --- }
 --- ```
 
-
----@type NvPluginSpec
 local spec = {
   {
     "zbirenbaum/copilot.lua",
@@ -22,8 +20,8 @@ local spec = {
     opts = {
       suggestion = {
         auto_trigger = true,
-      }
-    }
+      },
+    },
   },
 }
 
diff --git a/lua/nvcommunity/completion/tabnine/init.lua b/lua/nvcommunity/completion/tabnine/init.lua
index 1d2f1fb..bc61855 100644
--- a/lua/nvcommunity/completion/tabnine/init.lua
+++ b/lua/nvcommunity/completion/tabnine/init.lua
@@ -1,10 +1,9 @@
----@type NvPluginSpec
 local spec = {
   {
     "hrsh7th/nvim-cmp",
     config = function(_, opts)
-        table.insert(opts.sources, { name = "cmp_tabnine" })
-        require("cmp").setup(opts)
+      table.insert(opts.sources, { name = "cmp_tabnine" })
+      require("cmp").setup(opts)
     end,
     dependencies = {
       {
diff --git a/lua/nvcommunity/diagnostics/errorlens/init.lua b/lua/nvcommunity/diagnostics/errorlens/init.lua
index 3c6e0f8..8ff05aa 100644
--- a/lua/nvcommunity/diagnostics/errorlens/init.lua
+++ b/lua/nvcommunity/diagnostics/errorlens/init.lua
@@ -1,4 +1,3 @@
----@type NvPluginSpec
 local spec = {
   {
     "chikko80/error-lens.nvim",
diff --git a/lua/nvcommunity/diagnostics/trouble/init.lua b/lua/nvcommunity/diagnostics/trouble/init.lua
index f25630c..b5606ea 100644
--- a/lua/nvcommunity/diagnostics/trouble/init.lua
+++ b/lua/nvcommunity/diagnostics/trouble/init.lua
@@ -1,23 +1,18 @@
----@type NvPluginSpec
 local spec = {
   "folke/trouble.nvim",
   cmd = { "Trouble", "TroubleToggle", "TodoTrouble" },
   dependencies = {
     {
       "folke/todo-comments.nvim",
-      opts = {}
-    }
+      opts = {},
+    },
   },
   opts = {},
   init = function()
-    require("core.mappings").trouble = {
-      plugin = true,
-      n = {
-        ["<leader>t"] = { "<CMD>TroubleToggle<CR>", "Toggle diagnostics" },
-        ["<leader>td"] = { "<CMD>TodoTrouble keywords=TODO,FIX,FIXME,BUG,TEST,NOTE<CR>", "Todo/Fix/Fixme" },
-      },
-    }
-    require("core.utils").load_mappings "trouble"
+    local map = vim.keymap.set
+
+    map("n", "<leader>t", "<CMD>TroubleToggle<CR>", { desc = "Toggle diagnostics" })
+    map("n", "<leader>td", "<CMD>TodoTrouble keywords=TODO,FIX,FIXME,BUG,TEST,NOTE<CR>", { desc = "Todo/Fix/Fixme" })
   end,
 }
 
diff --git a/lua/nvcommunity/editor/autosave/init.lua b/lua/nvcommunity/editor/autosave/init.lua
index f110f04..93e3b91 100644
--- a/lua/nvcommunity/editor/autosave/init.lua
+++ b/lua/nvcommunity/editor/autosave/init.lua
@@ -1,4 +1,3 @@
----@type NvPluginSpec
 local spec = {
   {
     "okuuva/auto-save.nvim",
diff --git a/lua/nvcommunity/editor/beacon/init.lua b/lua/nvcommunity/editor/beacon/init.lua
index 46f9c6e..b4a8f75 100644
--- a/lua/nvcommunity/editor/beacon/init.lua
+++ b/lua/nvcommunity/editor/beacon/init.lua
@@ -1,4 +1,3 @@
----@type NvPluginSpec
 local spec = {
   {
     "rainbowhxch/beacon.nvim",
diff --git a/lua/nvcommunity/editor/biscuits/init.lua b/lua/nvcommunity/editor/biscuits/init.lua
index a777910..4f90203 100644
--- a/lua/nvcommunity/editor/biscuits/init.lua
+++ b/lua/nvcommunity/editor/biscuits/init.lua
@@ -1,4 +1,3 @@
----@type NvPluginSpec
 local spec = {
   {
     "code-biscuits/nvim-biscuits",
diff --git a/lua/nvcommunity/editor/cutlass/init.lua b/lua/nvcommunity/editor/cutlass/init.lua
index 3001cd7..102a234 100644
--- a/lua/nvcommunity/editor/cutlass/init.lua
+++ b/lua/nvcommunity/editor/cutlass/init.lua
@@ -1,4 +1,3 @@
----@type NvPluginSpec
 local spec = {
   {
     "gbprod/cutlass.nvim",
diff --git a/lua/nvcommunity/editor/hlargs/init.lua b/lua/nvcommunity/editor/hlargs/init.lua
index b86a547..5e699a1 100644
--- a/lua/nvcommunity/editor/hlargs/init.lua
+++ b/lua/nvcommunity/editor/hlargs/init.lua
@@ -1,15 +1,14 @@
----@type NvPluginSpec
 local spec = {
-    {
-      "m-demare/hlargs.nvim",
-      event = "BufWinEnter",
-      config = function()
-        require("hlargs").setup {
-          hl_priority = 200,
-        }
-      end,
-    },
-  }
-  
-  return spec
-  
\ No newline at end of file
+  {
+    "m-demare/hlargs.nvim",
+    event = "BufWinEnter",
+    config = function()
+      require("hlargs").setup {
+        hl_priority = 200,
+      }
+    end,
+  },
+}
+
+return spec
+
diff --git a/lua/nvcommunity/editor/illuminate/init.lua b/lua/nvcommunity/editor/illuminate/init.lua
index 79cb801..9518409 100644
--- a/lua/nvcommunity/editor/illuminate/init.lua
+++ b/lua/nvcommunity/editor/illuminate/init.lua
@@ -1,4 +1,3 @@
----@type NvPluginSpec
 local spec = {
   {
     "RRethy/vim-illuminate",
diff --git a/lua/nvcommunity/editor/rainbowdelimiters/init.lua b/lua/nvcommunity/editor/rainbowdelimiters/init.lua
index 5b03a39..ea16376 100644
--- a/lua/nvcommunity/editor/rainbowdelimiters/init.lua
+++ b/lua/nvcommunity/editor/rainbowdelimiters/init.lua
@@ -1,33 +1,32 @@
----@type NvPluginSpec
 local spec = {
-    {
-      "hiphish/rainbow-delimiters.nvim",
-      event = "BufReadPost",
-      config = function()
-        local rainbow_delimiters = require "rainbow-delimiters"
-  
-        vim.g.rainbow_delimiters = {
-          strategy = {
-            [""] = rainbow_delimiters.strategy["global"],
-            vim = rainbow_delimiters.strategy["local"],
-          },
-          query = {
-            [""] = "rainbow-delimiters",
-            lua = "rainbow-blocks",
-          },
-          highlight = {
-            "RainbowDelimiterRed",
-            "RainbowDelimiterYellow",
-            "RainbowDelimiterBlue",
-            "RainbowDelimiterOrange",
-            "RainbowDelimiterGreen",
-            "RainbowDelimiterViolet",
-            "RainbowDelimiterCyan",
-          },
-        }
-      end,
-    },
-  }
-  
-  return spec
-  
\ No newline at end of file
+  {
+    "hiphish/rainbow-delimiters.nvim",
+    event = "BufReadPost",
+    config = function()
+      local rainbow_delimiters = require "rainbow-delimiters"
+
+      vim.g.rainbow_delimiters = {
+        strategy = {
+          [""] = rainbow_delimiters.strategy["global"],
+          vim = rainbow_delimiters.strategy["local"],
+        },
+        query = {
+          [""] = "rainbow-delimiters",
+          lua = "rainbow-blocks",
+        },
+        highlight = {
+          "RainbowDelimiterRed",
+          "RainbowDelimiterYellow",
+          "RainbowDelimiterBlue",
+          "RainbowDelimiterOrange",
+          "RainbowDelimiterGreen",
+          "RainbowDelimiterViolet",
+          "RainbowDelimiterCyan",
+        },
+      }
+    end,
+  },
+}
+
+return spec
+
diff --git a/lua/nvcommunity/editor/satellite/init.lua b/lua/nvcommunity/editor/satellite/init.lua
index b8d5bfa..78c9cb7 100644
--- a/lua/nvcommunity/editor/satellite/init.lua
+++ b/lua/nvcommunity/editor/satellite/init.lua
@@ -1,4 +1,3 @@
----@type NvPluginSpec
 local spec = {
   {
     "lewis6991/satellite.nvim",
diff --git a/lua/nvcommunity/editor/symbols-outline/init.lua b/lua/nvcommunity/editor/symbols-outline/init.lua
index 0a9cdd0..c46efe9 100644
--- a/lua/nvcommunity/editor/symbols-outline/init.lua
+++ b/lua/nvcommunity/editor/symbols-outline/init.lua
@@ -1,4 +1,3 @@
----@type NvPluginSpec
 local spec = {
   "simrat39/symbols-outline.nvim",
   cmd = "SymbolsOutline",
diff --git a/lua/nvcommunity/editor/telescope-undo/init.lua b/lua/nvcommunity/editor/telescope-undo/init.lua
index 1e6ad60..b7bab80 100644
--- a/lua/nvcommunity/editor/telescope-undo/init.lua
+++ b/lua/nvcommunity/editor/telescope-undo/init.lua
@@ -1,18 +1,14 @@
----@type NvPluginSpec
 local spec = {
   "nvim-telescope/telescope.nvim",
   dependencies = {
     {
       "debugloop/telescope-undo.nvim",
       init = function()
-        require("core.mappings").undo = {
-          plugin = true,
-          n = {
-            ["<leader>fu"] = { "<CMD>Telescope undo<CR>", "Find undo" },
-          },
-        }
+        local map = vim.keymap.set
 
-        require("core.utils").load_mappings "undo"
+        map("n", "<leader>fu", "<CMD>Telescope undo<CR>", { desc = "Find undo" })
+      end,
+      config = function()
         require("telescope").load_extension "undo"
       end,
     },
diff --git a/lua/nvcommunity/editor/treesittercontext/init.lua b/lua/nvcommunity/editor/treesittercontext/init.lua
index 48a2bb2..ea2c905 100644
--- a/lua/nvcommunity/editor/treesittercontext/init.lua
+++ b/lua/nvcommunity/editor/treesittercontext/init.lua
@@ -1,4 +1,3 @@
----@type NvPluginSpec
 local spec = {
   {
     "nvim-treesitter/nvim-treesitter-context",
diff --git a/lua/nvcommunity/editor/treesj/init.lua b/lua/nvcommunity/editor/treesj/init.lua
index 220ee45..c0a375d 100644
--- a/lua/nvcommunity/editor/treesj/init.lua
+++ b/lua/nvcommunity/editor/treesj/init.lua
@@ -1,4 +1,3 @@
----@type NvPluginSpec
 local spec = {
   {
     "Wansmer/treesj",
@@ -6,12 +5,9 @@ local spec = {
     cmd = { "TSJToggle" },
     opts = { use_default_keymaps = false },
     init = function()
-      require("core.mappings").treesj = {
-        n = {
-          ["<leader>tt"] = { "<CMD>TSJToggle<CR>", "Toggle Treesitter Join/Split" },
-        },
-      }
-      require("core.utils").load_mappings "treesj"
+      local map = vim.keymap.set
+
+      map("n", "<leader>tt", "<CMD>TSJToggle<CR>", { desc = "Toggle Treesitter Join/Split" })
     end,
   },
 }
diff --git a/lua/nvcommunity/editor/undo/init.lua b/lua/nvcommunity/editor/undo/init.lua
index cfe7ef6..1c2c3e5 100644
--- a/lua/nvcommunity/editor/undo/init.lua
+++ b/lua/nvcommunity/editor/undo/init.lua
@@ -1,4 +1,3 @@
----@type NvPluginSpec
 local spec = {
   {
     "kevinhwang91/nvim-fundo",
diff --git a/lua/nvcommunity/file-explorer/oil-nvim/init.lua b/lua/nvcommunity/file-explorer/oil-nvim/init.lua
index ca3f098..9b95489 100644
--- a/lua/nvcommunity/file-explorer/oil-nvim/init.lua
+++ b/lua/nvcommunity/file-explorer/oil-nvim/init.lua
@@ -1,4 +1,3 @@
----@type NvPluginSpec
 local spec = {
   {
     "stevearc/oil.nvim",
diff --git a/lua/nvcommunity/folds/fold-cycle/init.lua b/lua/nvcommunity/folds/fold-cycle/init.lua
index 501d14c..1b81da0 100644
--- a/lua/nvcommunity/folds/fold-cycle/init.lua
+++ b/lua/nvcommunity/folds/fold-cycle/init.lua
@@ -1,20 +1,13 @@
----@type NvPluginSpec
 local spec = {
   {
     "jghauser/fold-cycle.nvim",
     opts = {},
     init = function()
-      require("core.mappings").foldcycle = {
-        n = {
-          ["<leader>a"] = {
-            function()
-              require("fold-cycle").toggle_all()
-            end,
-            "Toggle fold",
-          },
-        },
-      }
-      require("core.utils").load_mappings "foldclycle"
+      local map = vim.keymap.set
+
+      map("n", "<leader>a", function()
+        require("fold-cycle").toggle_all()
+      end, { desc = "Toggle fold" })
     end,
   },
 }
diff --git a/lua/nvcommunity/folds/fold-preview/init.lua b/lua/nvcommunity/folds/fold-preview/init.lua
index 04aae71..a4c2ddf 100644
--- a/lua/nvcommunity/folds/fold-preview/init.lua
+++ b/lua/nvcommunity/folds/fold-preview/init.lua
@@ -1,4 +1,3 @@
----@type NvPluginSpec
 local spec = {
   {
     "anuvyklack/fold-preview.nvim",
@@ -6,22 +5,13 @@ local spec = {
       border = { "╭", "─", "╮", "│", "╯", "─", "╰", "│" },
     },
     init = function()
-      require("core.mappings").foldpreview = {
-        n = {
-          ["<leader>a"] = {
-            function()
-              require("fold-preview").toggle_preview()
-            end,
-            "Fold preview",
-          },
-        },
-      }
+      local map = vim.keymap.set
 
-      require("core.utils").load_mappings "foldpreview"
+      map("n", "<leader>a", function()
+        require("fold-preview").toggle_preview()
+      end, { desc = "Fold preview" })
     end,
   },
 }
 
-
-
 return spec
diff --git a/lua/nvcommunity/folds/origami/init.lua b/lua/nvcommunity/folds/origami/init.lua
index 20f73fa..b7c2fe0 100644
--- a/lua/nvcommunity/folds/origami/init.lua
+++ b/lua/nvcommunity/folds/origami/init.lua
@@ -1,4 +1,3 @@
----@type NvPluginSpec
 local spec = {
   {
     "chrisgrieser/nvim-origami",
diff --git a/lua/nvcommunity/folds/tailwindfold/init.lua b/lua/nvcommunity/folds/tailwindfold/init.lua
index 81621f5..09fa81b 100644
--- a/lua/nvcommunity/folds/tailwindfold/init.lua
+++ b/lua/nvcommunity/folds/tailwindfold/init.lua
@@ -1,4 +1,3 @@
----@type NvPluginSpec
 local spec = {
   {
     "razak17/tailwind-fold.nvim",
diff --git a/lua/nvcommunity/folds/ufo/init.lua b/lua/nvcommunity/folds/ufo/init.lua
index 2feb50b..6971c79 100644
--- a/lua/nvcommunity/folds/ufo/init.lua
+++ b/lua/nvcommunity/folds/ufo/init.lua
@@ -1,4 +1,3 @@
----@type NvPluginSpec
 local spec = {
   {
     "kevinhwang91/nvim-ufo",
diff --git a/lua/nvcommunity/git/diffview/init.lua b/lua/nvcommunity/git/diffview/init.lua
index 52cd099..639ad46 100644
--- a/lua/nvcommunity/git/diffview/init.lua
+++ b/lua/nvcommunity/git/diffview/init.lua
@@ -11,8 +11,6 @@
 --- }
 --- ```
 
-
----@type NvPluginSpec
 local spec = {
   "lewis6991/gitsigns.nvim",
   dependencies = {
@@ -20,7 +18,7 @@ local spec = {
       "sindrets/diffview.nvim",
       config = true,
     },
-  }
+  },
 }
 
 return spec
diff --git a/lua/nvcommunity/git/lazygit/init.lua b/lua/nvcommunity/git/lazygit/init.lua
index a3c43d8..a55fa45 100644
--- a/lua/nvcommunity/git/lazygit/init.lua
+++ b/lua/nvcommunity/git/lazygit/init.lua
@@ -1,4 +1,3 @@
----@type NvPluginSpec
 local spec = {
   {
     "kdheepak/lazygit.nvim",
diff --git a/lua/nvcommunity/git/neogit/init.lua b/lua/nvcommunity/git/neogit/init.lua
index db620bc..6b51c20 100644
--- a/lua/nvcommunity/git/neogit/init.lua
+++ b/lua/nvcommunity/git/neogit/init.lua
@@ -1,4 +1,3 @@
----@type NvPluginSpec
 local spec = {
   {
     "NeogitOrg/neogit",
diff --git a/lua/nvcommunity/lsp/barbecue/init.lua b/lua/nvcommunity/lsp/barbecue/init.lua
index 6932fb8..e9cf595 100644
--- a/lua/nvcommunity/lsp/barbecue/init.lua
+++ b/lua/nvcommunity/lsp/barbecue/init.lua
@@ -1,4 +1,3 @@
----@type NvPluginSpec
 local spec = {
   {
     "utilyre/barbecue.nvim",
diff --git a/lua/nvcommunity/lsp/codeactionmenu/init.lua b/lua/nvcommunity/lsp/codeactionmenu/init.lua
index c25711b..3b7e1a9 100644
--- a/lua/nvcommunity/lsp/codeactionmenu/init.lua
+++ b/lua/nvcommunity/lsp/codeactionmenu/init.lua
@@ -1,4 +1,3 @@
----@type NvPluginSpec
 local spec = {
   {
 
diff --git a/lua/nvcommunity/lsp/dim/init.lua b/lua/nvcommunity/lsp/dim/init.lua
index 59cebba..865c191 100644
--- a/lua/nvcommunity/lsp/dim/init.lua
+++ b/lua/nvcommunity/lsp/dim/init.lua
@@ -1,4 +1,3 @@
----@type NvPluginSpec
 local spec = {
   {
     "0oAstro/dim.lua",
diff --git a/lua/nvcommunity/lsp/lsplines/init.lua b/lua/nvcommunity/lsp/lsplines/init.lua
index 8bb13e1..a3aecf5 100644
--- a/lua/nvcommunity/lsp/lsplines/init.lua
+++ b/lua/nvcommunity/lsp/lsplines/init.lua
@@ -1,11 +1,10 @@
----@type NvPluginSpec
 local spec = {
   {
     "https://git.sr.ht/~whynothugo/lsp_lines.nvim",
     event = "LspAttach",
     config = function()
       require("lsp_lines").setup()
-      vim.diagnostic.config({ virtual_text = false })
+      vim.diagnostic.config { virtual_text = false }
     end,
   },
 }
diff --git a/lua/nvcommunity/lsp/lspsaga/init.lua b/lua/nvcommunity/lsp/lspsaga/init.lua
index 4037f8f..7140448 100644
--- a/lua/nvcommunity/lsp/lspsaga/init.lua
+++ b/lua/nvcommunity/lsp/lspsaga/init.lua
@@ -1,4 +1,3 @@
----@type NvPluginSpec
 local spec = {
   {
     "nvimdev/lspsaga.nvim",
diff --git a/lua/nvcommunity/lsp/lspui/init.lua b/lua/nvcommunity/lsp/lspui/init.lua
index 1477fcb..58c5086 100644
--- a/lua/nvcommunity/lsp/lspui/init.lua
+++ b/lua/nvcommunity/lsp/lspui/init.lua
@@ -1,4 +1,3 @@
----@type NvPluginSpec
 local spec = {
   {
     "jinzhongjia/LspUI.nvim",
diff --git a/lua/nvcommunity/lsp/mason-lspconfig/init.lua b/lua/nvcommunity/lsp/mason-lspconfig/init.lua
index a2caadc..4a710eb 100644
--- a/lua/nvcommunity/lsp/mason-lspconfig/init.lua
+++ b/lua/nvcommunity/lsp/mason-lspconfig/init.lua
@@ -9,24 +9,24 @@ local setup = function(_, opts)
 
   require("mason").setup(opts)
 
-  require("mason-lspconfig").setup({
+  require("mason-lspconfig").setup {
     ensure_installed = servers,
-  })
+  }
 
   -- This will setup lsp for servers you listed above
   -- And servers you install through mason UI
   -- So defining servers in the list above is optional
-  require("mason-lspconfig").setup_handlers({
+  require("mason-lspconfig").setup_handlers {
     -- Default setup for all servers, unless a custom one is defined below
     function(server_name)
-      lspconfig[server_name].setup({
+      lspconfig[server_name].setup {
         on_attach = function(client, bufnr)
           on_attach(client, bufnr)
           -- Add your other things here
           -- Example being format on save or something
         end,
         capabilities = capabilities,
-      })
+      }
     end,
     -- custom setup for a server goes after the function above
     -- Example, override rust_analyzer
@@ -34,14 +34,14 @@ local setup = function(_, opts)
     --   require("rust-tools").setup {}
     -- end,
     -- Another example with clangd
-    -- Users usually run into different offset_encodings issue, 
+    -- Users usually run into different offset_encodings issue,
     -- so this is how to bypass it (kindof)
     ["clangd"] = function()
-      lspconfig.clangd.setup({
+      lspconfig.clangd.setup {
         cmd = {
           "clangd",
           "--offset-encoding=utf-16", -- To match null-ls
-          --  With this, you can configure server with 
+          --  With this, you can configure server with
           --    - .clangd files
           --    - global clangd/config.yaml files
           --  Read the `--enable-config` option in `clangd --help` for more information
@@ -51,16 +51,15 @@ local setup = function(_, opts)
           on_attach(client, bufnr)
         end,
         capabilities = capabilities,
-      })
+      }
     end,
 
     -- Example: disable auto configuring an LSP
     -- Here, we disable lua_ls so we can use NvChad's default config
     ["lua_ls"] = function() end,
-  })
+  }
 end
 
----@type NvPluginSpec
 local spec = {
   "neovim/nvim-lspconfig",
   -- BufRead is to make sure if you do nvim some_file then this is still going to be loaded
@@ -75,7 +74,7 @@ local spec = {
     },
     "williamboman/mason-lspconfig",
     -- TODO: Add mason-null-ls? mason-dap?
-  }
+  },
 }
 
 return spec
diff --git a/lua/nvcommunity/lsp/prettyhover/init.lua b/lua/nvcommunity/lsp/prettyhover/init.lua
index eadb312..5e16db0 100644
--- a/lua/nvcommunity/lsp/prettyhover/init.lua
+++ b/lua/nvcommunity/lsp/prettyhover/init.lua
@@ -1,11 +1,8 @@
----@type NvPluginSpec
 local spec = {
   {
-    {
-      "Fildo7525/pretty_hover",
-      keys = { "<leader>k" },
-      config = true,
-    },
+    "Fildo7525/pretty_hover",
+    keys = { "<leader>k" },
+    config = true,
   },
 }
 
diff --git a/lua/nvcommunity/motion/bookmarks/init.lua b/lua/nvcommunity/motion/bookmarks/init.lua
index c13e5a8..572006b 100644
--- a/lua/nvcommunity/motion/bookmarks/init.lua
+++ b/lua/nvcommunity/motion/bookmarks/init.lua
@@ -1,4 +1,3 @@
----@type NvPluginSpec
 local spec = {
   {
     "MattesGroeger/vim-bookmarks",
diff --git a/lua/nvcommunity/motion/harpoon/init.lua b/lua/nvcommunity/motion/harpoon/init.lua
index 6685953..f31a875 100644
--- a/lua/nvcommunity/motion/harpoon/init.lua
+++ b/lua/nvcommunity/motion/harpoon/init.lua
@@ -1,4 +1,3 @@
----@type NvPluginSpec
 local spec = {
   {
     "ThePrimeagen/harpoon",
diff --git a/lua/nvcommunity/motion/hop/init.lua b/lua/nvcommunity/motion/hop/init.lua
index 7248faa..15aa3e4 100644
--- a/lua/nvcommunity/motion/hop/init.lua
+++ b/lua/nvcommunity/motion/hop/init.lua
@@ -1,20 +1,15 @@
----@type NvPluginSpec
 local spec = {
   {
     "smoka7/hop.nvim",
     cmd = { "HopWord", "HopLine", "HopLineStart", "HopWordCurrentLine" },
     opts = { keys = "etovxqpdygfblzhckisuran" },
     init = function()
-      require("core.mappings").hop = {
-        n = {
-          ["<leader><leader>w"] = { "<CMD> HopWord <CR>", "Hint all words" },
-          ["<leader><leader>t"] = { "<CMD> HopNodes <CR>", "Hint Tree" },
-          ["<leader><leader>c"] = { "<CMD> HopLineStart<CR>", "Hint Columns" },
-          ["<leader><leader>l"] = { "<CMD> HopWordCurrentLine<CR>", "Hint Line" },
-        },
-      }
+      local map = vim.keymap.set
 
-      require("core.utils").load_mappings "hop"
+      map("n", "<leader><leader>w", "<CMD> HopWord <CR>", { desc = "Hint all words" })
+      map("n", "<leader><leader>t", "<CMD> HopNodes <CR>", { desc = "Hint Tree" })
+      map("n", "<leader><leader>c", "<CMD> HopLineStart<CR>", { desc = "Hint Columns" })
+      map("n", "<leader><leader>l", "<CMD> HopWordCurrentLine<CR>", { desc = "Hint Line" })
     end,
   },
 }
diff --git a/lua/nvcommunity/motion/neoscroll/init.lua b/lua/nvcommunity/motion/neoscroll/init.lua
index b6f14b5..ede9c20 100644
--- a/lua/nvcommunity/motion/neoscroll/init.lua
+++ b/lua/nvcommunity/motion/neoscroll/init.lua
@@ -1,4 +1,3 @@
----@type NvPluginSpec
 local spec = {
   {
     "karb94/neoscroll.nvim",
diff --git a/lua/nvcommunity/tools/conjure/init.lua b/lua/nvcommunity/tools/conjure/init.lua
index 51635b5..b4a3a30 100644
--- a/lua/nvcommunity/tools/conjure/init.lua
+++ b/lua/nvcommunity/tools/conjure/init.lua
@@ -1,4 +1,3 @@
----@type NvPluginSpec
 local spec = {
   {
     "hrsh7th/nvim-cmp",
diff --git a/lua/nvcommunity/tools/neocord/init.lua b/lua/nvcommunity/tools/neocord/init.lua
new file mode 100644
index 0000000..683dbee
--- /dev/null
+++ b/lua/nvcommunity/tools/neocord/init.lua
@@ -0,0 +1,9 @@
+local spec = {
+  {
+    "IogaMaster/neocord",
+    event = "VeryLazy",
+    opts = {},
+  },
+}
+
+return spec
diff --git a/lua/nvcommunity/tools/neocord/readme.md b/lua/nvcommunity/tools/neocord/readme.md
new file mode 100644
index 0000000..e325baf
--- /dev/null
+++ b/lua/nvcommunity/tools/neocord/readme.md
@@ -0,0 +1,3 @@
+# Neocord
+
+[neocord](https://github.com/IogaMaster/neocord)
diff --git a/lua/nvcommunity/tools/presence/init.lua b/lua/nvcommunity/tools/presence/init.lua
index 828671c..2054974 100644
--- a/lua/nvcommunity/tools/presence/init.lua
+++ b/lua/nvcommunity/tools/presence/init.lua
@@ -1,4 +1,3 @@
----@type NvPluginSpec
 local spec = {
   {
     "andweeb/presence.nvim",
diff --git a/lua/nvcommunity/tools/telescope-fzf-native/init.lua b/lua/nvcommunity/tools/telescope-fzf-native/init.lua
index 503f766..7bf9005 100644
--- a/lua/nvcommunity/tools/telescope-fzf-native/init.lua
+++ b/lua/nvcommunity/tools/telescope-fzf-native/init.lua
@@ -1,4 +1,3 @@
----@type NvPluginSpec
 local spec = {
   {
     "nvim-telescope/telescope.nvim",