diff --git a/lua/keybinds.lua b/lua/keybinds.lua
index e8a7ec9..9258c85 100644
--- a/lua/keybinds.lua
+++ b/lua/keybinds.lua
@@ -1,22 +1,17 @@
-vim.keymap.set("n", "<C-h>", "<C-w><C-h>", {})
-vim.keymap.set("n", "<C-j>", "<C-w><C-j>", {})
-vim.keymap.set("n", "<C-k>", "<C-w><C-k>", {})
-vim.keymap.set("n", "<C-l>", "<C-w><C-l>", {})
+vim.keymap.set("n", "<C-h>", "<C-w><C-h>", { desc = "Go to split on left" })
+vim.keymap.set("n", "<C-j>", "<C-w><C-j>", { desc = "Go to split above"})
+vim.keymap.set("n", "<C-k>", "<C-w><C-k>", { desc = "Go to split below"})
+vim.keymap.set("n", "<C-l>", "<C-w><C-l>", { desc = "Go to split on right" })
 
--- Move visual blocks around using J/K (up/down)
-vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv", {})
-vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv", {})
+vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv", { desc = "Move lines under cursor up" })
+vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv", { desc = "Move lines under cursor down" })
 
--- Keep search terms in the middle of the screen
-vim.keymap.set("n", "n", "nzzzv", {})
-vim.keymap.set("n", "N", "Nzzzv", {})
+vim.keymap.set("n", "n", "nzzzv", { desc = "Go to next search result and keep cursor centered on screen" })
+vim.keymap.set("n", "N", "Nzzzv", { desc = "Go to previous search result and keep cursor centered on screen" })
 
--- Paste without replacing clipboard contents
-vim.keymap.set("x", "<Leader>p", "\"_dP", {})
+vim.keymap.set("x", "<Leader>p", "\"_dP", { desc = "Paste without replacing clipboard contents" })
 
--- Yank into system clipboard
-vim.keymap.set("n", "<Leader>y", "\"*y", {})
-vim.keymap.set("v", "<Leader>y", "\"*y", {})
+vim.keymap.set("n", "<Leader>y", "\"*y", { desc = "Yank into system clipboard" })
+vim.keymap.set("v", "<Leader>y", "\"*y", { desc = "Yank into system clipboard" })
 
--- Like ciw on the text under the cursor
-vim.keymap.set("n", "<leader>s", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]])
+vim.keymap.set("n", "<leader>s", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]], { desc = "Like `ciw` for any highlighted text (doesn't have to be word)"})
diff --git a/lua/plugins/fugitive.lua b/lua/plugins/fugitive.lua
index a2e0c75..9636763 100644
--- a/lua/plugins/fugitive.lua
+++ b/lua/plugins/fugitive.lua
@@ -1,9 +1,10 @@
 return {
     "tpope/vim-fugitive",
     config = function ()
-        vim.keymap.set("n", "<Leader>gs", vim.cmd.Git)
-        vim.keymap.set("n", "gh", "<cmd>diffget //2<CR>")
-        vim.keymap.set("n", "gl", "<cmd>diffget //3<CR>")
+        vim.keymap.set("n", "<Leader>gs", vim.cmd.Git, { desc = "View `git status`" })
+        vim.keymap.set("n", "gh", "<cmd>diffget //2<CR>", { desc = "Pick gitdiff on left" })
+        vim.keymap.set("n", "gl", "<cmd>diffget //3<CR>", { desc = "Pick gitdiff on right" })
+        vim.keymap.set("n", "<Leader>gp", ":Git push<CR>", { desc = "Run `git push`" })
     end
 }
 
diff --git a/lua/plugins/hardtime.lua b/lua/plugins/hardtime.lua
index 4fd94bb..8b090fd 100644
--- a/lua/plugins/hardtime.lua
+++ b/lua/plugins/hardtime.lua
@@ -9,6 +9,18 @@ return {
             ["<Down>"] = {"", "i"},
             ["<Left>"] = {"", "i"},
             ["<Right>"] = {"", "i"}
+        },
+        disabled_filetypes = {
+            "checkhealth",
+            "fugitive",
+            "help",
+            "lazy",
+            "mason",
+            "neo-tree",
+            "neo-tree-popup",
+            "netrw",
+            "noice",
+            "notify",
         }
     }
 }
diff --git a/lua/plugins/lsp-config.lua b/lua/plugins/lsp-config.lua
index bda5a51..f418bac 100644
--- a/lua/plugins/lsp-config.lua
+++ b/lua/plugins/lsp-config.lua
@@ -37,11 +37,11 @@ return {
                 end
             })
 
-            vim.keymap.set('n', 'gd', vim.lsp.buf.definition, {})
-            vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, {})
-            vim.keymap.set('n', 'K', vim.lsp.buf.hover, {})
-            vim.keymap.set('n', '<Leader>f', vim.lsp.buf.format, {})
-            vim.keymap.set('n', '<Leader>vca', vim.lsp.buf.code_action, {})
+            vim.keymap.set('n', 'gd', vim.lsp.buf.definition, { desc = "Go to definition" })
+            vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, { desc = "Go to implementation" })
+            vim.keymap.set('n', 'K', vim.lsp.buf.hover, { desc = "Show signature" })
+            vim.keymap.set('n', '<Leader>f', vim.lsp.buf.format, { desc = "Format buffer" })
+            vim.keymap.set('n', '<Leader>ca', vim.lsp.buf.code_action, { desc = "View code actions" })
         end
     }
 }
diff --git a/lua/plugins/neo-tree.lua b/lua/plugins/neo-tree.lua
index f67dfbc..3855db3 100644
--- a/lua/plugins/neo-tree.lua
+++ b/lua/plugins/neo-tree.lua
@@ -7,7 +7,7 @@ return {
         "MunifTanjim/nui.nvim",
     },
     config = function()
-        vim.keymap.set("n", "<Leader>nn", ":Neotree<CR>", {})
+        vim.keymap.set("n", "<Leader>nn", ":Neotree<CR>", { desc = "Open Neotree" })
 
         local nt = require("neo-tree")
 
diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua
index 29b009e..ff69daa 100644
--- a/lua/plugins/telescope.lua
+++ b/lua/plugins/telescope.lua
@@ -6,12 +6,12 @@ return {
         config = function()
             local builtin = require('telescope.builtin')
 
-            vim.keymap.set('n', '<Leader>pp', builtin.git_files, {})
-            vim.keymap.set('n', '<Leader>pf', builtin.find_files, {})
-            vim.keymap.set('n', '<Leader>fh', builtin.help_tags, {})
+            vim.keymap.set('n', '<Leader>pp', builtin.git_files, { desc = "Search git_files" })
+            vim.keymap.set('n', '<Leader>pf', builtin.find_files, { desc = "Search all files "})
+            vim.keymap.set('n', '<Leader>fh', builtin.help_tags, { desc = "View help tags" })
             vim.keymap.set('n', '<Leader>ps', function()
                 builtin.grep_string({ search = vim.fn.input("Grep > ") })
-            end)
+            end, { desc = "Grep entire project for string" })
         end
     },
     {
diff --git a/lua/plugins/trouble.lua b/lua/plugins/trouble.lua
index b1ad96d..e7a9de2 100644
--- a/lua/plugins/trouble.lua
+++ b/lua/plugins/trouble.lua
@@ -2,6 +2,6 @@ return {
     "folke/trouble.nvim",
     dependencies = { "nvim-tree/nvim-web-devicons" },
     config = function()
-        vim.keymap.set("n", "<Leader>tt", ":TroubleToggle<CR>", {})
+        vim.keymap.set("n", "<Leader>tt", ":TroubleToggle<CR>", { desc = "Toggle Trouble" })
     end
  }