diff --git a/.config/nvim/lua/plugins/lsp.lua b/.config/nvim/lua/plugins/lsp.lua index ecea944..5d8ce84 100644 --- a/.config/nvim/lua/plugins/lsp.lua +++ b/.config/nvim/lua/plugins/lsp.lua @@ -71,25 +71,25 @@ return { filetypes = { 'rust' }, capabilities = capabilities, }, - ts_ls = { + vtsls = { filetypes = { 'typescript', 'javascript', 'javascriptreact', 'typescriptreact', 'vue' }, - init_options = { - plugins = { - { - name = '@vue/typescript-plugin', - location = vue_language_server_path, - languages = { 'javascript', 'typescript', 'vue' }, - configNamespace = 'javascript', - enableForWorkspaceTypeScriptVersions = true, + settings = { + vtsls = { + -- autoUseWorkspaceTsdk = true, + tsserver = { + globalPlugins = { + { + name = '@vue/typescript-plugin', + location = vue_language_server_path, + languages = { 'vue' }, + configNamespace = 'typescript', + enableForWorkspaceTypeScriptVersions = true, + }, + }, }, }, }, - settings = { - implicitProjectConfiguration = { - checkJs = true, - strictNullChecks = true, - }, - }, + capabilities = capabilities, }, biome = { capabilities = capabilities, @@ -98,12 +98,45 @@ return { filetypes = { 'php' }, capabilities = capabilities, }, - volar = { + vuels = { filetypes = { 'vue' }, capabilities = capabilities, init_options = { - vue = { - hybridMode = true, + config = { + css = {}, + emmet = {}, + html = { + suggest = {}, + }, + javascript = { + format = {}, + }, + stylusSupremacy = {}, + typescript = { + format = {}, + }, + vetur = { + completion = { + autoImport = false, + tagCasing = 'kebab', + useScaffoldSnippets = false, + }, + format = { + defaultFormatter = { + js = 'none', + ts = 'none', + }, + defaultFormatterOptions = {}, + scriptInitialIndent = false, + styleInitialIndent = false, + }, + useWorkspaceDependencies = false, + validation = { + script = true, + style = true, + template = true, + }, + }, }, }, }, diff --git a/.config/nvim/lua/plugins/mini.lua b/.config/nvim/lua/plugins/mini.lua index 9c6d54e..05cc315 100644 --- a/.config/nvim/lua/plugins/mini.lua +++ b/.config/nvim/lua/plugins/mini.lua @@ -2,7 +2,16 @@ return { 'echasnovski/mini.nvim', config = function() require('mini.ai').setup { n_lines = 500 } - require('mini.surround').setup() + require('mini.surround').setup { + mappings = { + add = 'gsa', + delete = 'gsd', + find = 'gsf', + find_left = 'gsF', + highlight = 'gsh', + replace = 'gsr', + }, + } require('mini.pairs').setup() require('mini.pick').setup() require('mini.icons').setup() diff --git a/.zshrc b/.zshrc index 6ae8a2c..4bdd576 100644 --- a/.zshrc +++ b/.zshrc @@ -56,5 +56,3 @@ alias c='clear' eval "$(fzf --zsh)" eval "$(zoxide init --cmd cd zsh)" -# go to home -cd ~