diff --git a/dmitmel-dotfiles b/dmitmel-dotfiles index ebd5826..4e5aba1 160000 --- a/dmitmel-dotfiles +++ b/dmitmel-dotfiles @@ -1 +1 @@ -Subproject commit ebd5826c599204db70d84e197abdae279c42a2f9 +Subproject commit 4e5aba17cb71ee70cf6dc10611a8291a7ff1ab8c diff --git a/nvim/dotfiles/lspconfigs/dart.lua b/nvim/dotfiles/lspconfigs/dart.lua index d7674ef..9dd0b52 100644 --- a/nvim/dotfiles/lspconfigs/dart.lua +++ b/nvim/dotfiles/lspconfigs/dart.lua @@ -1,4 +1,5 @@ -local ignition = require("dotfiles.lsp.ignition") -local dartls_config = require("lspconfig.server_configurations.dartls").default_config +local lspconfig = require('lspconfig') -ignition.setup_config("dartls", dartls_config) +local bin_name = 'dart' + +lspconfig['dartls'].setup({}) diff --git a/nvim/dotfiles/lspconfigs/html.lua b/nvim/dotfiles/lspconfigs/html.lua new file mode 100644 index 0000000..6b9fec4 --- /dev/null +++ b/nvim/dotfiles/lspconfigs/html.lua @@ -0,0 +1,34 @@ +local utils = require('kdotfiles.utils') +local lspconfig = require('lspconfig') + +local file = '/etc/os-release' +local lines = utils.lines_from(file) +local os_name = utils.get_os(lines) + +local cmd = (os_name == 'arch') and {'vscode-html-languageserver'} or {'vscode-html-language-server'} +vim.list_extend(cmd, {'--stdio'}) + +lspconfig['html'].setup({ + cmd = cmd; + filetypes = {'html', 'handlebars', 'htmldjango', 'blade'}; + completion_menu_label = 'HTML'; + + settings_scopes = {'html', 'css', 'javascript'}; + settings = { + html = { + format = { + enable = false; + }; + }; + javascript = { + format = { + enable = false; + }; + }; + css = { + format = { + enable = false; + }; + }; + }; +}) diff --git a/nvim/dotfiles/lspconfigs/php.lua b/nvim/dotfiles/lspconfigs/php.lua index 2effbad..fd01699 100644 --- a/nvim/dotfiles/lspconfigs/php.lua +++ b/nvim/dotfiles/lspconfigs/php.lua @@ -1,4 +1,3 @@ -local ignition = require("dotfiles.lsp.ignition") -local phpactor_config = require("lspconfig.server_configurations.phpactor").default_config +local lspconfig = require('lspconfig') -ignition.setup_config("phpactor", phpactor_config) +lspconfig['phpactor'].setup({})