diff options
18 files changed, 157 insertions, 274 deletions
diff --git a/nvim/.config/nvim/lua/plugins/cmp-dap.lua b/nvim/.config/nvim/lua/plugins/cmp-dap.lua deleted file mode 100644 index b0601b3..0000000 --- a/nvim/.config/nvim/lua/plugins/cmp-dap.lua +++ /dev/null @@ -1,20 +0,0 @@ ----@type LazyPluginSpec -local M = { - "rcarriga/cmp-dap", - ft = { "dap-repl" }, - dependencies = { - "mfussenegger/nvim-dap", - "hrsh7th/nvim-cmp", - }, -} - -function M:config() - ---@diagnostic disable-next-line: missing-fields - require("cmp").setup.filetype({ "dap-repl" }, { - sources = { - { name = "dap" }, - }, - }) -end - -return M diff --git a/nvim/.config/nvim/lua/plugins/cmp.lua b/nvim/.config/nvim/lua/plugins/cmp.lua index 871a0dc..66eeca6 100644 --- a/nvim/.config/nvim/lua/plugins/cmp.lua +++ b/nvim/.config/nvim/lua/plugins/cmp.lua @@ -12,6 +12,7 @@ local M = { "hrsh7th/cmp-nvim-lua", "hrsh7th/cmp-cmdline", "Dosx001/cmp-commit", + "rcarriga/cmp-dap", "davidsierradz/cmp-conventionalcommits", { "petertriho/cmp-git", @@ -134,6 +135,12 @@ function M:config() { name = "crates" }, }, }) + + cmp.setup.filetype("dap-repl", { + sources = { + { name = "dap" }, + }, + }) end return M diff --git a/nvim/.config/nvim/lua/plugins/colorize.lua b/nvim/.config/nvim/lua/plugins/colorize.lua new file mode 100644 index 0000000..ff612a1 --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/colorize.lua @@ -0,0 +1,26 @@ +local M = { + "NvChad/nvim-colorizer.lua", + ft = { + "css", + "scss", + "sass", + "javascript", + "html", + "htmldjango", + }, + opts = { + filetypes = { + "css", + "scss", + "sass", + "javascript", + "html", + "htmldjango", + }, + user_default_options = { + mode = "virtualtext", + }, + }, +} + +return M diff --git a/nvim/.config/nvim/lua/plugins/core.lua b/nvim/.config/nvim/lua/plugins/core.lua deleted file mode 100644 index 5ba0b2f..0000000 --- a/nvim/.config/nvim/lua/plugins/core.lua +++ /dev/null @@ -1,137 +0,0 @@ -local function setup_with(func_name) - ---@param plugin LazyPlugin - return function(plugin, opts) - pcall(require, plugin.main)[func_name](opts) - end -end - ----@type LazySpec[] -local M = { - "nvim-lua/plenary.nvim", - { - "lukas-reineke/virt-column.nvim", - event = "BufAdd", - opts = {}, - }, - { - "j-hui/fidget.nvim", - version = "*", - event = { "LspAttach" }, - cmd = "Fidget", - opts = { - notification = { - window = { - winblend = 0, - }, - }, - }, - }, - { - "akinsho/git-conflict.nvim", - event = "BufReadPre", - opts = { - disable_diagnostics = true, - default_mappings = { - prev = "[x", - next = "]x", - }, - }, - }, - { - "NvChad/nvim-colorizer.lua", - ft = { - "css", - "scss", - "sass", - "javascript", - "html", - "htmldjango", - }, - opts = { - filetypes = { - "css", - "scss", - "sass", - "javascript", - "html", - "htmldjango", - }, - user_default_options = { - mode = "virtualtext", - }, - }, - }, - { - "nvim-treesitter/nvim-treesitter-context", - event = "BufReadPre", - dependencies = { - "nvim-treesitter/nvim-treesitter", - }, - opts = { - separator = "─", - multiline_threshold = 1, - }, - }, - { - "f3fora/nvim-texlabconfig", - build = "go build -o ~/.local/bin", - ft = { "tex", "bib" }, - opts = {}, - }, - { - "mfussenegger/nvim-jdtls", - ft = "java", - opts = { - cmd = { "jdtls" }, - }, - config = setup_with("start_or_attach"), - }, - { - "eandrju/cellular-automaton.nvim", - cmd = "CellularAutomaton", - }, - { - "hjson/vim-hjson", - ft = "hjson", - }, - { - "chomosuke/typst-preview.nvim", - ft = "typst", - version = "*", - build = function() - require("typst-preview").update() - end, - }, - { - "tridactyl/vim-tridactyl", - ft = "tridactyl", - }, - { - "sourcegraph/sg.nvim", - cmd = { - "CodyDo", - "CodyAsk", - "CodyChat", - "CodyTask", - "CodyToggle", - "CodyRestart", - "CodyTaskNext", - "CodyTaskPrev", - "CodyTaskView", - "CodyTaskAccept", - "SourcegraphInfo", - "SourcegraphLink", - "SourcegraphBuild", - "SourcegraphLogin", - "SourcegraphSearch", - "SourcegraphDownloadBinaries", - }, - dependencies = { - "nvim-lua/plenary.nvim", - "nvim-telescope/telescope.nvim", - }, - opts = {}, - }, -} - -return M diff --git a/nvim/.config/nvim/lua/plugins/fidget.lua b/nvim/.config/nvim/lua/plugins/fidget.lua new file mode 100644 index 0000000..190388a --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/fidget.lua @@ -0,0 +1,15 @@ +local M = { + "j-hui/fidget.nvim", + version = "*", + event = { "LspAttach" }, + cmd = "Fidget", + opts = { + notification = { + window = { + winblend = 0, + }, + }, + }, +} + +return M diff --git a/nvim/.config/nvim/lua/plugins/git-log.lua b/nvim/.config/nvim/lua/plugins/git-log.lua deleted file mode 100644 index 50fa01f..0000000 --- a/nvim/.config/nvim/lua/plugins/git-log.lua +++ /dev/null @@ -1,19 +0,0 @@ -local M = { - "niuiic/git-log.nvim", - dependencies = { - "niuiic/core.nvim", - }, - opts = { - win = { - border = "single", - }, - }, -} - -function M:init() - vim.keymap.set({ "n", "v" }, "<leader>gl", function() - require("git-log").check_log() - end, { desc = "show git log" }) -end - -return M diff --git a/nvim/.config/nvim/lua/plugins/indent_blankline.lua b/nvim/.config/nvim/lua/plugins/indent_blankline.lua deleted file mode 100644 index 0cd6c03..0000000 --- a/nvim/.config/nvim/lua/plugins/indent_blankline.lua +++ /dev/null @@ -1,15 +0,0 @@ ----@type LazyPluginSpec -local M = { - "lukas-reineke/indent-blankline.nvim", - version = "*", - event = "BufReadPre", - main = "ibl", - opts = { - scope = { - show_start = false, - show_end = false, - }, - }, -} - -return M diff --git a/nvim/.config/nvim/lua/plugins/jdtls.lua b/nvim/.config/nvim/lua/plugins/jdtls.lua new file mode 100644 index 0000000..47e5db5 --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/jdtls.lua @@ -0,0 +1,13 @@ +local M = { + "mfussenegger/nvim-jdtls", + ft = "java", + opts = { + cmd = { "jdtls" }, + }, +} + +function M:config(opts) + require(self.main).start_or_attach(opts) +end + +return M diff --git a/nvim/.config/nvim/lua/plugins/nvim-lint.lua b/nvim/.config/nvim/lua/plugins/lint.lua index 4b6c45e..e72102f 100644 --- a/nvim/.config/nvim/lua/plugins/nvim-lint.lua +++ b/nvim/.config/nvim/lua/plugins/lint.lua @@ -14,7 +14,7 @@ local function try_lint() if not linter then vim.notify("Linter not found: " .. name, vim.log.levels.WARN, { title = "nvim-lint" }) end - ---@diagnostic disable-next-line: undefined-field + ---@diagnostic disable-next-line: undefined-field, return-type-mismatch return (type(linter) == "table" and linter.condition and linter.condition()) or linter end) :totable() diff --git a/nvim/.config/nvim/lua/plugins/mason-lspconfig.lua b/nvim/.config/nvim/lua/plugins/mason-lspconfig.lua deleted file mode 100644 index d7b9d71..0000000 --- a/nvim/.config/nvim/lua/plugins/mason-lspconfig.lua +++ /dev/null @@ -1,25 +0,0 @@ ----@type LazyPluginSpec -local M = { - "williamboman/mason-lspconfig.nvim", - version = "*", - event = "BufReadPre", - cmd = { - "LspInstall", - "LspUninstall", - }, - dependencies = { "williamboman/mason.nvim", "neovim/nvim-lspconfig" }, - opts = { - handlers = { - function(name) - local config = require("tobyvin.lsp.configs")[name] or {} - local available = require("lspconfig").util.available_servers() - - if not vim.tbl_contains(available, name) then - require("lspconfig")[name].setup(config) - end - end, - }, - }, -} - -return M diff --git a/nvim/.config/nvim/lua/plugins/mason-nvim-dap.lua b/nvim/.config/nvim/lua/plugins/mason-nvim-dap.lua deleted file mode 100644 index 12e8593..0000000 --- a/nvim/.config/nvim/lua/plugins/mason-nvim-dap.lua +++ /dev/null @@ -1,15 +0,0 @@ ----@type LazyPluginSpec -local M = { - "jayp0521/mason-nvim-dap.nvim", - version = "*", - cmd = { - "DapInstall", - "DapUninstall", - }, - dependencies = { "williamboman/mason.nvim", "mfussenegger/nvim-dap" }, - opts = { - handlers = {}, - }, -} - -return M diff --git a/nvim/.config/nvim/lua/plugins/mason-update-all.lua b/nvim/.config/nvim/lua/plugins/mason-update-all.lua deleted file mode 100644 index 368e518..0000000 --- a/nvim/.config/nvim/lua/plugins/mason-update-all.lua +++ /dev/null @@ -1,11 +0,0 @@ ----@type LazyPluginSpec -local M = { - "RubixDev/mason-update-all", - cmd = { - "MasonUpdateAll", - }, - dependencies = { "williamboman/mason.nvim" }, - config = true, -} - -return M diff --git a/nvim/.config/nvim/lua/plugins/misc.lua b/nvim/.config/nvim/lua/plugins/misc.lua new file mode 100644 index 0000000..367ff55 --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/misc.lua @@ -0,0 +1,40 @@ +---@type LazySpec[] +local M = { + { + "lukas-reineke/indent-blankline.nvim", + version = "*", + event = "BufReadPre", + main = "ibl", + opts = { + scope = { + show_start = false, + show_end = false, + }, + }, + }, + { + "lukas-reineke/virt-column.nvim", + event = "BufAdd", + opts = {}, + }, + { + "eandrju/cellular-automaton.nvim", + cmd = "CellularAutomaton", + }, + { + "hjson/vim-hjson", + ft = "hjson", + }, + { + "tridactyl/vim-tridactyl", + ft = "tridactyl", + }, + { + "f3fora/nvim-texlabconfig", + build = "go build -o ~/.local/bin", + ft = { "tex", "bib" }, + opts = {}, + }, +} + +return M diff --git a/nvim/.config/nvim/lua/plugins/oil.lua b/nvim/.config/nvim/lua/plugins/oil.lua index 0d69173..b7ce1a4 100644 --- a/nvim/.config/nvim/lua/plugins/oil.lua +++ b/nvim/.config/nvim/lua/plugins/oil.lua @@ -1,4 +1,3 @@ ----@diagnostic disable: param-type-mismatch ---@type LazyPluginSpec local M = { "stevearc/oil.nvim", @@ -20,8 +19,9 @@ function M:init() end, { desc = "Open parent directory" }) if vim.fn.argc() == 1 then - local stat = vim.loop.fs_stat(vim.fn.argv(0)) - local adapter = string.match(vim.fn.argv(0), "^([%l-]*)://") + arg = vim.fn.argv(0) --[[@as string]] + local stat = vim.loop.fs_stat(arg) + local adapter = string.match(arg, "^([%l-]*)://") if (stat and stat.type == "directory") or adapter == "oil-ssh" then require("lazy").load({ plugins = { "oil.nvim" } }) end diff --git a/nvim/.config/nvim/lua/plugins/refactoring.lua b/nvim/.config/nvim/lua/plugins/refactoring.lua deleted file mode 100644 index 20a5cae..0000000 --- a/nvim/.config/nvim/lua/plugins/refactoring.lua +++ /dev/null @@ -1,28 +0,0 @@ ----@type LazyPluginSpec -local M = { - "ThePrimeagen/refactoring.nvim", - dependencies = { - "nvim-treesitter/nvim-treesitter", - }, - config = true, -} - -function M.init() - vim.keymap.set("v", "<leader>rr", function() - require("refactoring").select_refactor({}) - end, { desc = "refactor" }) - - vim.keymap.set("n", "<leader>ri", function() - require("refactoring").refactor("Inline Variable") - end, { desc = "inline variable" }) - - vim.keymap.set("n", "<leader>rb", function() - require("refactoring").refactor("Extract Block") - end, { desc = "extract block" }) - - vim.keymap.set("n", "<leader>rf", function() - require("refactoring").refactor("Extract Block To File") - end, { desc = "extract block to file" }) -end - -return M diff --git a/nvim/.config/nvim/lua/plugins/sg.lua b/nvim/.config/nvim/lua/plugins/sg.lua new file mode 100644 index 0000000..11b899b --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/sg.lua @@ -0,0 +1,28 @@ +local M = { + "sourcegraph/sg.nvim", + cmd = { + "CodyDo", + "CodyAsk", + "CodyChat", + "CodyTask", + "CodyToggle", + "CodyRestart", + "CodyTaskNext", + "CodyTaskPrev", + "CodyTaskView", + "CodyTaskAccept", + "SourcegraphInfo", + "SourcegraphLink", + "SourcegraphBuild", + "SourcegraphLogin", + "SourcegraphSearch", + "SourcegraphDownloadBinaries", + }, + dependencies = { + "nvim-lua/plenary.nvim", + "nvim-telescope/telescope.nvim", + }, + opts = {}, +} + +return M diff --git a/nvim/.config/nvim/lua/plugins/treesitter_context.lua b/nvim/.config/nvim/lua/plugins/treesitter_context.lua new file mode 100644 index 0000000..cf5161c --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/treesitter_context.lua @@ -0,0 +1,13 @@ +local M = { + "nvim-treesitter/nvim-treesitter-context", + event = "BufReadPre", + dependencies = { + "nvim-treesitter/nvim-treesitter", + }, + opts = { + separator = "─", + multiline_threshold = 1, + }, +} + +return M diff --git a/nvim/.config/nvim/lua/plugins/typst_preview.lua b/nvim/.config/nvim/lua/plugins/typst_preview.lua new file mode 100644 index 0000000..c40c38f --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/typst_preview.lua @@ -0,0 +1,11 @@ +local M = { + "chomosuke/typst-preview.nvim", + ft = "typst", + version = "*", +} + +function M:build() + require("typst-preview").update() +end + +return M |