diff --git a/lazy-lock.json b/lazy-lock.json
index 2e832f3..18fefe3 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -24,7 +24,6 @@
   "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" },
   "nvim-lspconfig": { "branch": "master", "commit": "a27356f1ef9c11e1f459cc96a3fcac5c265e72d6" },
   "nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" },
-  "nvim-nu": { "branch": "main", "commit": "f45f36a97fb0ea6e39f08cc2fac7a2fb3dc3999b" },
   "nvim-tree.lua": { "branch": "master", "commit": "5897b3622f033b1f3ea6adf8eb1c165e9f20554f" },
   "nvim-treesitter": { "branch": "master", "commit": "63260da18bf273c76b8e2ea0db84eb901cab49ce" },
   "nvim-treesitter-context": { "branch": "master", "commit": "31692b26d76ff1f7c6e0ab51814dd55e7417e96c" },
diff --git a/lua/valeth/plugins/autopairs.lua b/lua/valeth/plugins/autopairs.lua
index 564d0e2..078f534 100644
--- a/lua/valeth/plugins/autopairs.lua
+++ b/lua/valeth/plugins/autopairs.lua
@@ -2,6 +2,10 @@ local spec = {
     "windwp/nvim-autopairs",
 }
 
+spec.dependencies = {
+    "hrsh7th/nvim-cmp",
+}
+
 spec.config = function()
     local cmp_autopairs = require("nvim-autopairs.completion.cmp")
     local cmp = require("cmp")
diff --git a/lua/valeth/plugins/init.lua b/lua/valeth/plugins/init.lua
index 04cd912..2c71119 100644
--- a/lua/valeth/plugins/init.lua
+++ b/lua/valeth/plugins/init.lua
@@ -1,6 +1,7 @@
 return {
     {
         "cameron-wags/rainbow_csv.nvim",
+        ft = "csv",
         opts = {},
     },
 
diff --git a/lua/valeth/plugins/lsp/cmp.lua b/lua/valeth/plugins/lsp/cmp.lua
index fa726cb..d9a3a76 100644
--- a/lua/valeth/plugins/lsp/cmp.lua
+++ b/lua/valeth/plugins/lsp/cmp.lua
@@ -1,6 +1,5 @@
 local spec = {
     "hrsh7th/nvim-cmp",
-    event = "LspAttach",
 }
 
 spec.dependencies = {
@@ -13,6 +12,8 @@ spec.dependencies = {
     "rafamadriz/friendly-snippets",
 }
 
+spec.event = "LspAttach"
+
 spec.config = function()
     local cmp = require("cmp")
     local lspk = require("lspkind")
diff --git a/lua/valeth/plugins/lsp/ufo.lua b/lua/valeth/plugins/lsp/ufo.lua
index c5ec163..63b632e 100644
--- a/lua/valeth/plugins/lsp/ufo.lua
+++ b/lua/valeth/plugins/lsp/ufo.lua
@@ -1,12 +1,13 @@
 local spec = {
     "kevinhwang91/nvim-ufo",
-    event = "LspAttach",
 }
 
 spec.dependencies = {
     "kevinhwang91/promise-async",
 }
 
+spec.event = "LspAttach"
+
 spec.config = function()
     local ufo = require("ufo")
     local autocmd = vim.api.nvim_create_autocmd
diff --git a/lua/valeth/plugins/neogit.lua b/lua/valeth/plugins/neogit.lua
index 990d74a..d82cfbb 100644
--- a/lua/valeth/plugins/neogit.lua
+++ b/lua/valeth/plugins/neogit.lua
@@ -6,6 +6,11 @@ spec.dependencies = {
     "nvim-lua/plenary.nvim",
 }
 
+spec.keys = {
+    "<Leader>vs",
+    "<Leader>vc",
+}
+
 spec.config = function()
     local neogit = require("neogit")
 
diff --git a/lua/valeth/plugins/nvim_tree.lua b/lua/valeth/plugins/nvim_tree.lua
index cb434ed..e24c57e 100644
--- a/lua/valeth/plugins/nvim_tree.lua
+++ b/lua/valeth/plugins/nvim_tree.lua
@@ -6,11 +6,14 @@ spec.dependencies = {
     "nvim-tree/nvim-web-devicons"
 }
 
+spec.keys = {
+    { "<Leader>ft", "<cmd>NvimTreeToggle<CR>", mode = "n" },
+}
+
 spec.config = function()
     local nvim_tree = require("nvim-tree")
     local nvim_tree_api = require("nvim-tree.api")
 
-    vim.keymap.set("n", "<Leader>ft", nvim_tree_api.tree.open)
 
     local function kmap_opts(bufnr, desc)
         return {
diff --git a/lua/valeth/plugins/presence.lua b/lua/valeth/plugins/presence.lua
index 9850885..fa208b9 100644
--- a/lua/valeth/plugins/presence.lua
+++ b/lua/valeth/plugins/presence.lua
@@ -2,6 +2,8 @@ local spec = {
     "andweeb/presence.nvim",
 }
 
+spec.cmd = "PresenceToggle"
+
 spec.config = function()
     local presence = require("presence")
     local presence_disabled = true
diff --git a/lua/valeth/plugins/undotree.lua b/lua/valeth/plugins/undotree.lua
index e79ae93..13d3d31 100644
--- a/lua/valeth/plugins/undotree.lua
+++ b/lua/valeth/plugins/undotree.lua
@@ -2,6 +2,10 @@ local spec = {
     "jiaoshijie/undotree",
 }
 
+spec.keys = {
+    "<Leader>u",
+}
+
 spec.config = function()
     local undotree = require("undotree")