diff --git a/neovim/lua/plugins.lua b/neovim/lua/plugins.lua
index 20a7047..cbb442c 100644
--- a/neovim/lua/plugins.lua
+++ b/neovim/lua/plugins.lua
@@ -348,6 +348,17 @@ return require("packer").startup({
             cmd = { "StartupTime" },
         })
 
+        -- Fancy todo highlighting
+        use({
+            "folke/todo-comments.nvim",
+            requires = {
+                "nvim-lua/plenary.nvim",
+            },
+            config = function()
+                require("plugins.todo")
+            end,
+        })
+
         -- Auto sync after bootstrapping on a fresh box
         if packer_bootstrap then
             require("packer").sync()
diff --git a/neovim/lua/plugins/todo.lua b/neovim/lua/plugins/todo.lua
new file mode 100644
index 0000000..24fd8ae
--- /dev/null
+++ b/neovim/lua/plugins/todo.lua
@@ -0,0 +1,23 @@
+require("todo-comments").setup({
+    signs = false,
+    keywords = {
+        FIX = {
+            icon = "🩹",
+        },
+        TODO = {
+            icon = "✏️",
+        },
+        HACK = {
+            icon = "🙈",
+        },
+        PERF = {
+            icon = "🚀",
+        },
+        NOTE = {
+            icon = "📓",
+        },
+        WARNING = {
+            icon = "⚠️",
+        },
+    },
+})