diff --git a/config/default.nix b/config/default.nix
index 50a444e..ec98d73 100644
--- a/config/default.nix
+++ b/config/default.nix
@@ -23,6 +23,7 @@ _: {
     ./plugins/editor/undotree.nix
     ./plugins/editor/illuminate.nix
     ./plugins/editor/indent-blankline.nix
+    ./plugins/editor/todo-comments.nix
 
     # UI plugins
     ./plugins/ui/bufferline.nix
diff --git a/config/plugins/editor/todo-comments.nix b/config/plugins/editor/todo-comments.nix
new file mode 100644
index 0000000..2dafc34
--- /dev/null
+++ b/config/plugins/editor/todo-comments.nix
@@ -0,0 +1,12 @@
+_: {
+  plugins.todo-comments = {
+    enable = true;
+    colors = {
+      error = ["DiagnosticError" "ErrorMsg" "#ED8796"];
+      warning = ["DiagnosticWarn" "WarningMsg" "#EED49F"];
+      info = ["DiagnosticInfo" "#EED49F"];
+      default = ["Identifier" "#F5A97F"];
+      test = ["Identifier" "#8AADF4"];
+    };
+  };
+}
diff --git a/config/plugins/utils/telescope.nix b/config/plugins/utils/telescope.nix
index ddcb801..f38fdd5 100644
--- a/config/plugins/utils/telescope.nix
+++ b/config/plugins/utils/telescope.nix
@@ -21,7 +21,7 @@
     };
     keymaps = {
       "<leader><space>" = {
-        action = "find_files, {}";
+        action = "find_files";
         options = {
           desc = "Find project files";
         };
@@ -33,139 +33,139 @@
         };
       };
       "<leader>:" = {
-        action = "command_history, {}";
+        action = "command_history";
         options = {
           desc = "Command History";
         };
       };
       "<leader>b" = {
-        action = "buffers, {}";
+        action = "buffers";
         options = {
           desc = "+buffer";
         };
       };
       "<leader>ff" = {
-        action = "find_files, {}";
+        action = "find_files";
         options = {
           desc = "Find project files";
         };
       };
       "<leader>fr" = {
-        action = "live_grep, {}";
+        action = "live_grep";
         options = {
           desc = "Find text";
         };
       };
       "<leader>fR" = {
-        action = "resume, {}";
+        action = "resume";
         options = {
           desc = "Resume";
         };
       };
       "<leader>fg" = {
-        action = "oldfiles, {}";
+        action = "oldfiles";
         options = {
           desc = "Recent";
         };
       };
       "<leader>fb" = {
-        action = "buffers, {}";
+        action = "buffers";
         options = {
           desc = "Buffers";
         };
       };
       "<C-p>" = {
-        action = "git_files, {}";
+        action = "git_files";
         options = {
           desc = "Search git files";
         };
       };
       "<leader>gc" = {
-        action = "git_commits, {}";
+        action = "git_commits";
         options = {
           desc = "Commits";
         };
       };
       "<leader>gs" = {
-        action = "git_status, {}";
+        action = "git_status";
         options = {
           desc = "Status";
         };
       };
       "<leader>sa" = {
-        action = "autocommands, {}";
+        action = "autocommands";
         options = {
           desc = "Auto Commands";
         };
       };
       "<leader>sb" = {
-        action = "current_buffer_fuzzy_find, {}";
+        action = "current_buffer_fuzzy_find";
         options = {
           desc = "Buffer";
         };
       };
       "<leader>sc" = {
-        action = "command_history, {}";
+        action = "command_history";
         options = {
           desc = "Command History";
         };
       };
       "<leader>sC" = {
-        action = "commands, {}";
+        action = "commands";
         options = {
           desc = "Commands";
         };
       };
       "<leader>sD" = {
-        action = "diagnostics, {}";
+        action = "diagnostics";
         options = {
           desc = "Workspace diagnostics";
         };
       };
       "<leader>sh" = {
-        action = "help_tags, {}";
+        action = "help_tags";
         options = {
           desc = "Help pages";
         };
       };
       "<leader>sH" = {
-        action = "highlights, {}";
+        action = "highlights";
         options = {
           desc = "Search Highlight Groups";
         };
       };
       "<leader>sk" = {
-        action = "keymaps, {}";
+        action = "keymaps";
         options = {
           desc = "Keymaps";
         };
       };
       "<leader>sM" = {
-        action = "man_pages, {}";
+        action = "man_pages";
         options = {
           desc = "Man pages";
         };
       };
       "<leader>sm" = {
-        action = "marks, {}";
+        action = "marks";
         options = {
           desc = "Jump to Mark";
         };
       };
       "<leader>so" = {
-        action = "vim_options, {}";
+        action = "vim_options";
         options = {
           desc = "Options";
         };
       };
       "<leader>sR" = {
-        action = "resume, {}";
+        action = "resume";
         options = {
           desc = "Resume";
         };
       };
       "<leader>uC" = {
-        action = "colorscheme, {}";
+        action = "colorscheme";
         options = {
           desc = "Colorscheme preview";
         };
diff --git a/flake.lock b/flake.lock
index 3c62ecc..30b77c3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -218,11 +218,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1716457508,
-        "narHash": "sha256-ZxzffLuWRyuMrkVVq7wastNUqeO0HJL9xqfY1QsYaqo=",
+        "lastModified": 1717052710,
+        "narHash": "sha256-LRhOxzXmOza5SymhOgnEzA8EAQp+94kkeUYWKKpLJ/U=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "850cb322046ef1a268449cf1ceda5fd24d930b05",
+        "rev": "29c69d9a466e41d46fd3a7a9d0591ef9c113c2ae",
         "type": "github"
       },
       "original": {
@@ -239,11 +239,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1716511055,
-        "narHash": "sha256-5Fe/DGgvMhPEMl9VdVxv3zvwRcwNDmW5eRJ0gk72w7U=",
+        "lastModified": 1716993688,
+        "narHash": "sha256-vo5k2wQekfeoq/2aleQkBN41dQiQHNTniZeVONWiWLs=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "0bea8222f6e83247dd13b055d83e64bce02ee532",
+        "rev": "c0d5b8c54d6828516c97f6be9f2d00c63a363df4",
         "type": "github"
       },
       "original": {
@@ -254,11 +254,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1716509168,
-        "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=",
+        "lastModified": 1716948383,
+        "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "bfb7a882678e518398ce9a31a881538679f6f092",
+        "rev": "ad57eef4ef0659193044870c731987a6df5cf56b",
         "type": "github"
       },
       "original": {
@@ -311,11 +311,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1716925245,
-        "narHash": "sha256-MO32KGgZUiWWsDYu93H47iOGWNlXO9BVOMrZzauZKCc=",
+        "lastModified": 1717097562,
+        "narHash": "sha256-4thrq0yjTmGEXH/EjteE/UoYjKZzuxWfULZEIRpfP08=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "56d39f54fe11776ba83903ec077bffc7a7d0e638",
+        "rev": "25338942a7ee8d641c8d56ba3726a1cb114580ea",
         "type": "github"
       },
       "original": {