diff --git a/init.lua b/init.lua index 572f365..f5dedc1 100644 --- a/init.lua +++ b/init.lua @@ -379,6 +379,17 @@ local servers = { }, }, + ts_ls = { + init_options = { + plugins = { + { + name = '@vue/typescript-plugin', + location = vue_language_server_path, + languages = { 'vue' }, + }, + }, + }, + filetypes = { 'typescript', 'javascript', 'javascriptreact', 'typescriptreact', 'vue' }, }, lua_ls = { diff --git a/lua/custom/plugins/colorscheme.lua b/lua/custom/plugins/colorscheme.lua index 5ec0552..c88c8d3 100644 --- a/lua/custom/plugins/colorscheme.lua +++ b/lua/custom/plugins/colorscheme.lua @@ -14,20 +14,16 @@ local fileContent = read_file(string.format("%s/colorscheme", home)); if fileContent == "white" then colorscheme = { - 'maxmx03/solarized.nvim', + 'marko-cerovac/material.nvim', lazy = false, priority = 1000, config = function() vim.o.background = 'light' vim.opt.termguicolors = true - require('solarized').setup({ - theme = 'neo', - styles = { - functions = { bold = true, italic = false } - }, - }) - vim.cmd.colorscheme 'solarized' - vim.cmd [[highlight ColorColumn ctermbg=235 guibg=#435156]] + vim.g.material_style = 'lighter' + require('material').setup({}) + vim.cmd.colorscheme 'material' + -- vim.cmd [[highlight ColorColumn ctermbg=235 guibg=#435156]] end, } elseif fileContent == "red" then