6 files changed, 135 insertions, 45 deletions
diff --git a/nvim/lua/plugins/filetypes.lua b/nvim/lua/plugins/filetypes.lua
new file mode 100644
index 0000000..3ed883a
--- /dev/null
+++ b/nvim/lua/plugins/filetypes.lua
@@ -0,0 +1,42 @@
+return {
+    {
+        'habamax/vim-godot',
+        ft = 'gdscript'
+    },
+    {
+        'vim-pandoc/vim-pandoc',
+        ft = { "markdown", "pandoc" },
+        keys = {
+            { 'gO', vim.cmd.TOC, desc = "Table of contents" }
+        }
+    },
+    {
+        'vim-pandoc/vim-pandoc-syntax',
+        ft = { "markdown", "pandoc" }
+    },
+    {
+        "tpope/vim-dadbod",
+        lazy = true
+    },
+    {
+        'kristijanhusak/vim-dadbod-completion',
+        ft = { 'sql', 'mysql', 'plsql' },
+        lazy = true
+    },
+    {
+        'kristijanhusak/vim-dadbod-ui',
+        dependencies = {
+            "tpope/vim-dadbod",
+            'kristijanhusak/vim-dadbod-completion'
+        },
+        cmd = {
+            'DBUI',
+            'DBUIToggle',
+            'DBUIAddConnection',
+            'DBUIFindBuffer',
+        },
+        init = function()
+            vim.g.db_ui_use_nerd_fonts = 1
+        end,
+    }
+}
diff --git a/nvim/lua/plugins/godot.lua b/nvim/lua/plugins/godot.lua
deleted file mode 100644
index 79028a3..0000000
--- a/nvim/lua/plugins/godot.lua
+++ /dev/null
@@ -1,4 +0,0 @@
-return {
-    'habamax/vim-godot',
-    ft = 'gdscript'
-}
diff --git a/nvim/lua/plugins/pandoc.lua b/nvim/lua/plugins/pandoc.lua
deleted file mode 100644
index 32471d4..0000000
--- a/nvim/lua/plugins/pandoc.lua
+++ /dev/null
@@ -1,13 +0,0 @@
-return {
-    {
-        'vim-pandoc/vim-pandoc',
-        ft = {"markdown", "pandoc"},
-        keys = {
-            {'gO', vim.cmd.TOC, desc = "Markdown file Table of Contents"}
-        }
-    },
-    {
-        'vim-pandoc/vim-pandoc-syntax',
-        ft = {"markdown", "pandoc"}
-    }
-}
diff --git a/nvim/lua/plugins/sql.lua b/nvim/lua/plugins/sql.lua
deleted file mode 100644
index 253aed4..0000000
--- a/nvim/lua/plugins/sql.lua
+++ /dev/null
@@ -1,28 +0,0 @@
-local dadbod = {
-    "tpope/vim-dadbod",
-    lazy = true
-}
-local dadbod_completions = {
-    'kristijanhusak/vim-dadbod-completion',
-    ft = { 'sql', 'mysql', 'plsql' },
-    lazy = true
-}
-local dadbod_ui = {
-    'kristijanhusak/vim-dadbod-ui',
-    dependencies = {
-        dadbod,
-        dadbod_completions
-    },
-    cmd = {
-        'DBUI',
-        'DBUIToggle',
-        'DBUIAddConnection',
-        'DBUIFindBuffer',
-    },
-    init = function()
-        vim.g.db_ui_use_nerd_fonts = 1
-    end,
-}
-return {
-    dadbod_ui,
-}
diff --git a/nvim/lua/plugins/telescope.lua b/nvim/lua/plugins/telescope.lua
index 2e925c3..e9f9c26 100644
--- a/nvim/lua/plugins/telescope.lua
+++ b/nvim/lua/plugins/telescope.lua
@@ -4,6 +4,7 @@ return {
         'nvim-lua/plenary.nvim',
         'nvim-tree/nvim-web-devicons'
     },
+    cmd = 'Telescope',
     keys = {
         {"<leader>ff", function()
             require("telescope.builtin").find_files()
diff --git a/nvim/lua/plugins/todos.lua b/nvim/lua/plugins/todos.lua
new file mode 100644
index 0000000..1e5d4ad
--- /dev/null
+++ b/nvim/lua/plugins/todos.lua
@@ -0,0 +1,92 @@
+return {
+    'folke/todo-comments.nvim',
+    dependencies = { "nvim-lua/plenary.nvim", "folke/trouble.nvim" },
+    opts = {},
+    cmd = {
+        'TodoQuickFix',
+        'TodoLocList',
+        'TodoTrouble',
+        'TodoTelescope'
+    },
+    keys = {
+        {
+            "<leader>tf",
+            function()
+                local trouble = require("trouble")
+                local opts = {
+                    mode = "todo",
+                    focus = true,
+                    follow = false
+                }
+                if trouble.is_open(opts) then
+                    if vim.o.ft == "trouble" then
+                        trouble.close(opts)
+                    else
+                        trouble.focus()
+                    end
+                else
+                    trouble.open(opts)
+                end
+            end,
+            mode = 'n',
+            desc = "Open todo comments in a trouble window"
+        },
+        {
+            "<leader>tF",
+            function()
+                local trouble = require("trouble")
+                local opts = {
+                    mode = "todo",
+                    focus = true,
+                    follow = false,
+                    filter = { buf = 0 }
+                }
+                if trouble.is_open(opts) then
+                    if vim.o.ft == "trouble" then
+                        trouble.close(opts)
+                    else
+                        trouble.focus()
+                    end
+                else
+                    trouble.open(opts)
+                end
+            end,
+            mode = 'n',
+            desc = "Open buffer local todo comments in a trouble window"
+        },
+        {
+            "<leader>tq",
+            "<cmd>TodoQuickFix<cr>",
+            mode = 'n',
+            desc = "Quickfix List (Todo Comments)"
+        },
+        {
+            "<leader>tl",
+            "<cmd>TodoLocList<cr>",
+            mode = 'n',
+            desc = "Location List (Todo Comments)"
+        },
+        {
+            "]t",
+            function()
+                require('trouble').next({ mode = "todo", jump = true })
+            end,
+            mode = 'n',
+            desc = "Next todo comment"
+        },
+        {
+            "[t",
+            function()
+                require('trouble').prev({ mode = "todo", jump = true })
+            end,
+            mode = 'n',
+            desc = "Previous todo comment"
+        },
+        {
+            "<leader>ft",
+            "<cmd>TodoTelescope<cr>",
+            mode = 'n',
+            desc = "Open Todos in quickfix list"
+        }
+    }
+}