diff --git a/nvim/.config/nvim/lua/plugins/languages/coq.lua b/nvim/.config/nvim/lua/plugins/languages/coq.lua deleted file mode 100644 index 08480bf..0000000 --- a/nvim/.config/nvim/lua/plugins/languages/coq.lua +++ /dev/null @@ -1,25 +0,0 @@ -return { - { - 'whonore/Coqtail', - event = { 'BufReadPre *.v', 'BufNewFile *.v' }, - init = function() - vim.g.loaded_coqtail = 1 - vim.g['coqtail#supported'] = 0 - end - }, - { - 'tomtomjhj/vscoq.nvim', - event = { 'BufReadPre *.v', 'BufNewFile *.v'}, - filetypes = 'coq', - opts = true, - dependencies = { 'whonore/Coqtail', 'neovim/nvim-lspconfig' }, - } - -- { - -- 'tomtomjhj/coq-lsp.nvim', - -- event = { 'BufReadPre *.v', 'BufNewFile *.v' }, - -- opts = { - -- autostart = true, - -- }, - -- dependencies = { 'whonore/Coqtail' } - -- } -} diff --git a/nvim/.config/nvim/lua/plugins/languages/mizar.lua b/nvim/.config/nvim/lua/plugins/languages/mizar.lua deleted file mode 100644 index 8fd52ba..0000000 --- a/nvim/.config/nvim/lua/plugins/languages/mizar.lua +++ /dev/null @@ -1,5 +0,0 @@ -return { - { - 'andy-morris/mizar.vim', - } -} diff --git a/nvim/.config/nvim/lua/plugins/languages/typst.lua b/nvim/.config/nvim/lua/plugins/languages/typst.lua deleted file mode 100644 index 4c86ca5..0000000 --- a/nvim/.config/nvim/lua/plugins/languages/typst.lua +++ /dev/null @@ -1,8 +0,0 @@ -return { - { - 'chomosuke/typst-preview.nvim', - ft = typst, - version = '1.*', - opts = {}, - }, -} diff --git a/nvim/.config/nvim/lua/plugins/languages/zig.lua b/nvim/.config/nvim/lua/plugins/languages/zig.lua index db8e85a..9c87a62 100644 --- a/nvim/.config/nvim/lua/plugins/languages/zig.lua +++ b/nvim/.config/nvim/lua/plugins/languages/zig.lua @@ -1,27 +1,28 @@ -return { - { - "jinzhongjia/zig-lamp", - event = "VeryLazy", - build = ":ZigLamp build sync", - dependencies = { - "neovim/nvim-lspconfig", - "nvim-lua/plenary.nvim", - }, - init = function() - -- Timeout in milliseconds for automatic ZLS installation - -- Set to nil to disable auto-install - vim.g.zig_lamp_zls_auto_install = nil - - -- Fallback to system ZLS if local version not found - -- Set to any non-negative value to enable - vim.g.zig_lamp_fall_back_sys_zls = nil - - -- LSP configuration options passed to lspconfig - vim.g.zig_lamp_zls_lsp_opt = {} - - -- UI customization - vim.g.zig_lamp_pkg_help_fg = "#CF5C00" - vim.g.zig_lamp_zig_fetch_timeout = 5000 - end, - } -} +return {} +-- return { +-- { +-- "jinzhongjia/zig-lamp", +-- event = "VeryLazy", +-- build = ":ZigLamp build sync", +-- dependencies = { +-- "neovim/nvim-lspconfig", +-- "nvim-lua/plenary.nvim", +-- }, +-- init = function() +-- -- Timeout in milliseconds for automatic ZLS installation +-- -- Set to nil to disable auto-install +-- vim.g.zig_lamp_zls_auto_install = nil +-- +-- -- Fallback to system ZLS if local version not found +-- -- Set to any non-negative value to enable +-- vim.g.zig_lamp_fall_back_sys_zls = nil +-- +-- -- LSP configuration options passed to lspconfig +-- vim.g.zig_lamp_zls_lsp_opt = {} +-- +-- -- UI customization +-- vim.g.zig_lamp_pkg_help_fg = "#CF5C00" +-- vim.g.zig_lamp_zig_fetch_timeout = 5000 +-- end, +-- } +-- } diff --git a/nvim/.config/nvim/lua/plugins/lsp.lua b/nvim/.config/nvim/lua/plugins/lsp.lua index 420e89d..ecf45a7 100644 --- a/nvim/.config/nvim/lua/plugins/lsp.lua +++ b/nvim/.config/nvim/lua/plugins/lsp.lua @@ -3,14 +3,15 @@ return { 'neovim/nvim-lspconfig', config = function() local capabilities = require('cmp_nvim_lsp').default_capabilities() - local lspconfig = require('lspconfig') local wk = require('which-key') - lspconfig.ocamllsp.setup({ + vim.lsp.enable('ocamllsp') + vim.lsp.config('ocamllsp', { capabilities = capabilities }) - lspconfig.tinymist.setup({ + vim.lsp.enable('tinymist') + vim.lsp.config('tinymist', { settings = { formatterMode = "typstyle", exportPdf = "onType", @@ -18,15 +19,17 @@ return { } }) - lspconfig.millet.setup({ + vim.lsp.enable('millet') + vim.lsp.config('millet', { root_dir = function(fname) - local util = require("lspconfig.util") + local util = vim.lsp.config.util return util.root_pattern(".cm", ".mlb")(fname) or util.path.dirname(fname) end }) - lspconfig.clangd.setup({ + vim.lsp.enable('clangd') + vim.lsp.config('clangd', { capabilities = capabilities })