4 Commits

6 changed files with 33 additions and 18 deletions

View File

@@ -2,6 +2,13 @@
vim.g.mapleader = " " vim.g.mapleader = " "
vim.g.maplocalleader = " " vim.g.maplocalleader = " "
-- NOTE: Keep settings at the top, otherwise some options don't work well.
-- mainly have had trouble with not using the settings in an `.editorconfig`
-- file for projects.
-- Common settings
require("user.settings")
-- Auto commands -- Auto commands
require("user.autocmd") require("user.autocmd")
@@ -13,6 +20,3 @@ require("user.keymaps")
-- Theme (must stay after plugins are loaded) -- Theme (must stay after plugins are loaded)
require("user.theme") require("user.theme")
-- Common settings
require("user.settings")

View File

@@ -43,7 +43,8 @@ return {
if luasnip.expandable() then if luasnip.expandable() then
luasnip.expand() luasnip.expand()
else else
cmp.confirm({ behavior = cmp.ConfirmBehavior.Insert, select = true }) cmp.mapping.confirm({ select = false })
fallback()
end end
else else
fallback() fallback()

View File

@@ -1,15 +1,20 @@
return { return {
"folke/todo-comments.nvim", "folke/todo-comments.nvim",
dependencies = { "nvim-lua/plenary.nvim" }, dependencies = { "nvim-lua/plenary.nvim" },
opts = { }, opts = {},
config = function() config = function()
require('todo-comments').setup({}) local todos = require("todo-comments")
vim.keymap.set('n', '<leader>tq', '<CMD>TodoQuickFix<CR>', todos.setup({})
{ desc = "[T]odo [Q]uick fix list." }
) vim.keymap.set("n", "<leader>tq", "<CMD>TodoQuickFix<CR>", { desc = "[T]odo [Q]uick fix list." })
vim.keymap.set('n', '<leader><leader>t', '<CMD>TodoTelescope<CR>', vim.keymap.set("n", "<leader><leader>t", "<CMD>TodoTelescope<CR>", { desc = "[T]odo telescope list." })
{ desc = "[T]odo [Q]uick fix list." } vim.keymap.set("n", "<leader>tl", "<CMD>TodoLocList<CR>", { desc = "[T]odo [L]ocation list." })
) vim.keymap.set("n", "]t", function()
todos.jump_next()
end, { desc = "Next [T]odo" })
vim.keymap.set("n", "[t", function()
todos.jump_prev()
end, { desc = "Previous [T]odo" })
end, end,
} }

View File

@@ -4,8 +4,9 @@ return {
event = { "BufReadPre", "BufNewFile" }, event = { "BufReadPre", "BufNewFile" },
keys = { keys = {
{ "<leader>t", "<cmd>Trouble diagnostics toggle<cr>", { desc = "[T]rouble diagnostics" } }, { "<leader>t", "<cmd>Trouble diagnostics toggle<cr>", { desc = "[T]rouble diagnostics" } },
{ "<leader>tq", "<cmd>Trouble quickfix toggle<cr>", { desc = "Open a quickfix" } }, -- FIX: - These collide with todo-comment keymaps.
{ "<leader>tl", "<cmd>Trouble loclist toggle<cr>", { desc = "[T]rouble [L]ocation list" } }, --{ "<leader>tq", "<cmd>Trouble quickfix toggle<cr>", { desc = "Open a quickfix" } },
--{ "<leader>tl", "<cmd>Trouble loclist toggle<cr>", { desc = "[T]rouble [L]ocation list" } },
}, },
opts = {}, opts = {},

View File

@@ -9,3 +9,7 @@ CFM
Hydronic Hydronic
subpar subpar
quo quo
IAQ
wc
HVAC
dehumidification

Binary file not shown.