diff --git a/config/neovim/after/plugin/todo-comments.lua b/config/neovim/after/plugin/todo-comments.lua
index 3de9789..60a017c 100644
--- a/config/neovim/after/plugin/todo-comments.lua
+++ b/config/neovim/after/plugin/todo-comments.lua
@@ -4,3 +4,11 @@ if not status_ok then
 end
 
 todo_comments.setup {}
+
+local nmap = require "opdavies.keymap".nmap
+
+nmap { "[t", function() todo_comments.jump_prev() end, { desc = "Previous todo comment" }}
+nmap { "]t", function() todo_comments.jump_next() end, { desc = "Next todo comment" }}
+
+nmap { "<leader>tt", "<cmd>TodoTelescope<cr>" }
+nmap { "<leader>tq", "<cmd>TodoQuickFix<cr>" }
diff --git a/system/shared/home-manager.nix b/system/shared/home-manager.nix
index ee93234..6ca2fbd 100644
--- a/system/shared/home-manager.nix
+++ b/system/shared/home-manager.nix
@@ -524,6 +524,7 @@ in
       vimPlugins.refactoring-nvim
       vimPlugins.rest-nvim
       vimPlugins.splitjoin-vim
+      vimPlugins.todo-comments-nvim
       vimPlugins.undotree
       vimPlugins.vim-easy-align
       vimPlugins.vim-eunuch