aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/nvim
diff options
context:
space:
mode:
Diffstat (limited to 'nvim')
-rw-r--r--nvim/.config/nvim/lua/tobyvin/autocmds.lua97
-rw-r--r--nvim/.config/nvim/lua/tobyvin/lsp/highlighting.lua10
-rw-r--r--nvim/.config/nvim/lua/tobyvin/plugins.lua7
-rw-r--r--nvim/.config/nvim/lua/tobyvin/plugins/treesitter.lua34
4 files changed, 66 insertions, 82 deletions
diff --git a/nvim/.config/nvim/lua/tobyvin/autocmds.lua b/nvim/.config/nvim/lua/tobyvin/autocmds.lua
index 71560a8..be0589f 100644
--- a/nvim/.config/nvim/lua/tobyvin/autocmds.lua
+++ b/nvim/.config/nvim/lua/tobyvin/autocmds.lua
@@ -1,10 +1,10 @@
local M = {}
M.setup = function()
- local group = vim.api.nvim_create_augroup("tobyvin", { clear = true })
+ local augroup = vim.api.nvim_create_augroup("tobyvin_buffers", { clear = true })
vim.api.nvim_create_autocmd("User", {
- group = group,
+ group = augroup,
pattern = "bdelete",
callback = function(opts)
local windows = vim.tbl_filter(function(win)
@@ -35,8 +35,28 @@ M.setup = function()
desc = "Sets the window to the alternate buffer for bdelete",
})
+ local augroup_hl = vim.api.nvim_create_augroup("tobyvin_hl", { clear = true })
+
+ vim.api.nvim_create_autocmd("CmdlineEnter", {
+ group = augroup_hl,
+ pattern = "/,?",
+ callback = function()
+ vim.opt.hlsearch = true
+ end,
+ desc = "Enable hlsearch on input",
+ })
+
+ vim.api.nvim_create_autocmd("CmdlineLeave", {
+ group = augroup_hl,
+ pattern = "/,?",
+ callback = function()
+ vim.opt.hlsearch = false
+ end,
+ desc = "Disable hlsearch on exit",
+ })
+
vim.api.nvim_create_autocmd("TextYankPost", {
- group = group,
+ group = augroup_hl,
pattern = "*",
callback = function()
vim.highlight.on_yank()
@@ -44,8 +64,10 @@ M.setup = function()
desc = "Highlight yank",
})
+ local augroup_fmt = vim.api.nvim_create_augroup("tobyvin_fmt", { clear = true })
+
vim.api.nvim_create_autocmd("BufWritePre", {
- group = group,
+ group = augroup_fmt,
pattern = "*",
callback = function()
local cursor = vim.api.nvim_win_get_cursor(0)
@@ -56,71 +78,44 @@ M.setup = function()
})
vim.api.nvim_create_autocmd("FileType", {
- group = group,
+ group = augroup_fmt,
pattern = "help",
- callback = function()
- vim.opt_local.wrap = true
- vim.opt_local.textwidth = 120
- vim.opt_local.colorcolumn = nil
- vim.cmd("wincmd L")
- vim.cmd("vertical resize " .. vim.opt.textwidth:get())
- end,
- desc = "Resize help window",
+ callback = function() end,
+ desc = "Format help window",
})
vim.api.nvim_create_autocmd("FileType", {
- group = group,
- pattern = "qf",
- callback = function()
- vim.opt_local.buflisted = false
- end,
- desc = "Hide filetype from buffer list",
- })
-
- vim.api.nvim_create_autocmd("FileType", {
- group = group,
+ group = augroup_fmt,
pattern = { "sh", "zsh", "xml", "html", "xhtml", "css", "scss", "javascript", "lua", "dart", "markdown" },
callback = function()
vim.opt_local.tabstop = 2
end,
- desc = "Set file specific tabstop",
+ desc = "Set tabstop",
})
- local augroup_search_highlighting = vim.api.nvim_create_augroup("SearchHighlighting", { clear = true })
+ local augroup_view = vim.api.nvim_create_augroup("tobyvin_view", { clear = true })
- vim.api.nvim_create_autocmd("CmdlineEnter", {
- group = augroup_search_highlighting,
- pattern = "/,?",
+ vim.api.nvim_create_autocmd("FileType", {
+ group = augroup_view,
+ pattern = "qf",
callback = function()
- vim.opt.hlsearch = true
+ vim.opt_local.buflisted = false
end,
- desc = "Enable hlsearch on input",
+ desc = "Hide quickfix from buffer list",
})
- vim.api.nvim_create_autocmd("CmdlineLeave", {
- group = augroup_search_highlighting,
- pattern = "/,?",
+ vim.api.nvim_create_autocmd("FileType", {
+ group = augroup_view,
+ pattern = "help",
callback = function()
- vim.opt.hlsearch = false
+ vim.opt_local.wrap = true
+ vim.opt_local.textwidth = 120
+ vim.opt_local.colorcolumn = nil
+ vim.cmd("wincmd L")
+ vim.cmd("vertical resize " .. vim.opt.textwidth:get())
end,
- desc = "Disable hlsearch on exit",
+ desc = "Setup and resize help window",
})
-
- -- TODO: figure out how to do this correctly
- -- config reloading
- -- local configs = vim.api.nvim_create_augroup("Configs", { clear = true })
- --
- -- vim.api.nvim_create_autocmd("BufWritePost", {
- -- group = configs,
- -- pattern = ".nvimrc.lua",
- -- command = "source <afile>",
- -- })
- --
- -- vim.api.nvim_create_autocmd("BufWritePost", {
- -- group = configs,
- -- pattern = os.getenv("HOME") .. "/.config/nvim/*/*.lua",
- -- command = "source $MYVIMRC",
- -- })
end
return M
diff --git a/nvim/.config/nvim/lua/tobyvin/lsp/highlighting.lua b/nvim/.config/nvim/lua/tobyvin/lsp/highlighting.lua
index f4ecf59..9fe8d68 100644
--- a/nvim/.config/nvim/lua/tobyvin/lsp/highlighting.lua
+++ b/nvim/.config/nvim/lua/tobyvin/lsp/highlighting.lua
@@ -2,17 +2,17 @@ local M = {}
M.on_attach = function(client, bufnr)
if client.server_capabilities.documentHighlightProvider then
- M.augroup_highlight = vim.api.nvim_create_augroup("ReferenceHighlight", { clear = true })
+ local augroup_highlight = vim.api.nvim_create_augroup("DocumentHighlight", { clear = false })
- vim.api.nvim_create_autocmd("CursorHold", {
- group = M.augroup_highlight,
+ vim.api.nvim_create_autocmd({ "CursorHold", "CursorHoldI" }, {
+ group = augroup_highlight,
buffer = bufnr,
callback = vim.lsp.buf.document_highlight,
desc = "Highlight lsp references",
})
- vim.api.nvim_create_autocmd("CursorMoved", {
- group = M.augroup_highlight,
+ vim.api.nvim_create_autocmd({ "CursorMoved", "CursorMovedI" }, {
+ group = augroup_highlight,
buffer = bufnr,
callback = vim.lsp.buf.clear_references,
desc = "Clear highlighted references",
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins.lua b/nvim/.config/nvim/lua/tobyvin/plugins.lua
index b370196..c72358e 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins.lua
+++ b/nvim/.config/nvim/lua/tobyvin/plugins.lua
@@ -475,13 +475,6 @@ M.plugins = function(use)
})
use({
- "antoinemadec/FixCursorHold.nvim",
- config = function()
- vim.g.curshold_updatime = 500
- end,
- })
-
- use({
"numToStr/Comment.nvim",
config = function()
require("tobyvin.plugins.comment").setup()
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/treesitter.lua b/nvim/.config/nvim/lua/tobyvin/plugins/treesitter.lua
index c9bd6cc..6b78385 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/treesitter.lua
+++ b/nvim/.config/nvim/lua/tobyvin/plugins/treesitter.lua
@@ -32,10 +32,6 @@ M.setup = function()
enable = true,
},
refactor = {
- highlight_definitions = {
- enable = true,
- clear_on_cursor_move = true,
- },
smart_rename = {
enable = true,
keymaps = {
@@ -54,21 +50,21 @@ M.setup = function()
enable = true,
lookahead = true,
keymaps = {
- ["af"] = "@function.outer", -- { query = "@function.outer", desc = "a function" },
- ["if"] = "@function.inner", -- { query = "@function.inner", desc = "inner function" },
- ["ia"] = "@statement.inner", -- { query = "@statement.inner", desc = "inner statement" },
- ["aa"] = "@statement.outer", -- { query = "@statement.outer", desc = "a statement" },
- ["il"] = "@loop.inner", -- { query = "@loop.inner", desc = "inner loop" },
- ["al"] = "@loop.outer", -- { query = "@loop.outer", desc = "a loop" },
- ["ib"] = "@block.inner", -- { query = "@block.inner", desc = "inner block" },
- ["ab"] = "@block.outer", -- { query = "@block.outer", desc = "a block" },
- ["ic"] = "@class.inner", -- { query = "@class.inner", desc = "inner class" },
- ["ac"] = "@class.outer", -- { query = "@class.outer", desc = "a class" },
- ["a/"] = "@comment.outer", -- { query = "@comment.outer", desc = "a comment" },
- ["ii"] = "@conditional.inner", -- { query = "@conditional.inner", desc = "inner conditional" },
- ["ai"] = "@conditional.outer", -- { query = "@conditional.outer", desc = "a conditional" },
- ["iv"] = "@parameter.inner", -- { query = "@parameter.inner", desc = "inner parameter" },
- ["av"] = "@parameter.outer", -- { query = "@parameter.outer", desc = "a parameter" },
+ ["af"] = "@function.outer",
+ ["if"] = "@function.inner",
+ ["ia"] = "@statement.inner",
+ ["aa"] = "@statement.outer",
+ ["il"] = "@loop.inner",
+ ["al"] = "@loop.outer",
+ ["ib"] = "@block.inner",
+ ["ab"] = "@block.outer",
+ ["ic"] = "@class.inner",
+ ["ac"] = "@class.outer",
+ ["a/"] = "@comment.outer",
+ ["ii"] = "@conditional.inner",
+ ["ai"] = "@conditional.outer",
+ ["iv"] = "@parameter.inner",
+ ["av"] = "@parameter.outer",
},
},
},
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-10-02 12:26:40 +0000