diff --git a/lua/overseer/template/user/clang/clang-tidy.lua b/lua/overseer/template/user/clang/clang-tidy.lua
new file mode 100644
index 0000000..998bc04
--- /dev/null
+++ b/lua/overseer/template/user/clang/clang-tidy.lua
@@ -0,0 +1,22 @@
+return {
+  name = 'clang-tidy',
+  builder = function()
+    -- Full path to current file (see :help expand())
+    local dir = vim.loop.cwd()
+    local file = vim.fn.expand('%:p')
+    return {
+      cmd = { 'clang-tidy' },
+      -- cmd = { 'c:/Users/uid40528/scoop/apps/llvm/current/bin/clang-tidy.exe' },
+      args = { file, '-p', 'build_nvim', '--quiet', '--config-file', dir .. '/.clang-tidy' },
+      cwd = dir,
+      components = {
+        { 'on_result_diagnostics_quickfix', open = true },
+        { 'on_output_parse',                problem_matcher = '$gcc' },
+        { 'on_result_diagnostics' },
+        'default' },
+    }
+  end,
+  condition = {
+    filetype = { 'cpp' },
+  },
+}
diff --git a/lua/plugins/overseer.lua b/lua/plugins/overseer.lua
index fcefbee..af9a5b5 100644
--- a/lua/plugins/overseer.lua
+++ b/lua/plugins/overseer.lua
@@ -2,18 +2,32 @@ return {
   'stevearc/overseer.nvim',
   config = function()
     require('overseer').setup({
-      templates = { 'builtin', 'user.cmake.cmake' },
+      templates = { 'builtin', 'user.cmake.cmake', 'user.clang.clang-tidy' },
     })
   end,
   keys = {
     {
       '<f4>',
       function()
-        require('overseer').open()
         require('overseer').run_template()
       end,
       mode = { 'n', 'x' },
       desc = 'Start task (overseer)',
     },
+  },
+  cmd = {
+    'OverseerOpen',
+    'OverseerClose',
+    'OverseerToggle',
+    'OverseerSaveBundle',
+    'OverseerLoadBundle',
+    'OverseerDeleteBundle',
+    'OverseerRunCmd',
+    'OverseerRun',
+    'OverseerInfo',
+    'OverseerBuild',
+    'OverseerQuickAction',
+    'OverseerTaskAction',
+    'OverseerClearCache'
   }
 }