diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index a474c8a..89c1210 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -4,6 +4,7 @@ "flash.nvim": { "branch": "develop", "commit": "045457978f3fb7df03efa2023dbc8a5f6e9179bd" }, "formatter.nvim": { "branch": "master", "commit": "b9d7f853da1197b83b8edb4cc4952f7ad3a42e41" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, + "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, "markview.nvim": { "branch": "main", "commit": "d5d37102d24c3d5d032b01263855081b6850509b" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, "mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" }, diff --git a/.config/nvim/lsp/ts_ls.lua b/.config/nvim/lsp/ts_ls.lua new file mode 100644 index 0000000..fd0f1be --- /dev/null +++ b/.config/nvim/lsp/ts_ls.lua @@ -0,0 +1,5 @@ +return { + cmd = { 'typescript-language-server', '--stdio' }, + filetypes = { 'typescript', 'javascript' }, + root_markers = { 'package.json', 'tsconfig.json' }, +} diff --git a/.config/nvim/lua/plugins/additions.lua b/.config/nvim/lua/plugins/additions.lua index 05222a9..4326d8a 100644 --- a/.config/nvim/lua/plugins/additions.lua +++ b/.config/nvim/lua/plugins/additions.lua @@ -4,9 +4,14 @@ return { event = 'VeryLazy', build = ':Cord update', opts = {}, + cond = vim.env.CORDLESS ~= 'true', }, { 'tpope/vim-fugitive', cmd = { 'Git' }, }, + { + dir = '~/dev/share.nvim/', + opts = {}, + }, } diff --git a/.config/nvim/lua/plugins/format.lua b/.config/nvim/lua/plugins/format.lua index 41115a7..f22b874 100644 --- a/.config/nvim/lua/plugins/format.lua +++ b/.config/nvim/lua/plugins/format.lua @@ -11,7 +11,7 @@ local function formatter(exe, args) table.insert(argv, val) end - if not args.path == false then + if args.path ~= false then table.insert(argv, vim.fn.shellescape(vim.api.nvim_buf_get_name(0))) end diff --git a/.config/nvim/lua/plugins/lsp.lua b/.config/nvim/lua/plugins/lsp.lua index 0d24112..2a83ba0 100644 --- a/.config/nvim/lua/plugins/lsp.lua +++ b/.config/nvim/lua/plugins/lsp.lua @@ -7,7 +7,7 @@ return { 'mason-org/mason-lspconfig.nvim', version = '1.*', opts = { - ensure_installed = { 'lua_ls', 'rust_analyzer' }, + ensure_installed = { 'rust_analyzer' }, }, config = function(lazy) local mason_lspconfig = require('mason-lspconfig') @@ -21,7 +21,6 @@ return { 'mason-org/mason.nvim', }, }, - { 'Saghen/blink.cmp', dependencies = { common.icons },