From b12f028ce9aeeb42256da376bd64757ce8393f75 Mon Sep 17 00:00:00 2001 From: GitHub Date: Sun, 26 Dec 2021 00:32:29 +0000 Subject: [PATCH 1/3] [dmitmel] Update submodule --- dmitmel-dotfiles | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dmitmel-dotfiles b/dmitmel-dotfiles index 4e5aba1..ebd5826 160000 --- a/dmitmel-dotfiles +++ b/dmitmel-dotfiles @@ -1 +1 @@ -Subproject commit 4e5aba17cb71ee70cf6dc10611a8291a7ff1ab8c +Subproject commit ebd5826c599204db70d84e197abdae279c42a2f9 From 209057c9ff3effae9faf312b33dd7ea51c934a8e Mon Sep 17 00:00:00 2001 From: Alyxia Sother Date: Sun, 26 Dec 2021 14:49:47 +0100 Subject: [PATCH 2/3] [nvim] Remove the html LSP config --- nvim/dotfiles/lspconfigs/html.lua | 34 ------------------------------- 1 file changed, 34 deletions(-) delete mode 100644 nvim/dotfiles/lspconfigs/html.lua diff --git a/nvim/dotfiles/lspconfigs/html.lua b/nvim/dotfiles/lspconfigs/html.lua deleted file mode 100644 index 6b9fec4..0000000 --- a/nvim/dotfiles/lspconfigs/html.lua +++ /dev/null @@ -1,34 +0,0 @@ -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; - }; - }; - }; -}) From 689ea21ed89d6f136075be5741461c719a6d8f1e Mon Sep 17 00:00:00 2001 From: Alyxia Sother Date: Sun, 26 Dec 2021 15:13:10 +0100 Subject: [PATCH 3/3] [nvim] Rewrite lspconfigs to use Ignition --- nvim/dotfiles/lspconfigs/dart.lua | 7 +++---- nvim/dotfiles/lspconfigs/php.lua | 5 +++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nvim/dotfiles/lspconfigs/dart.lua b/nvim/dotfiles/lspconfigs/dart.lua index 9dd0b52..d7674ef 100644 --- a/nvim/dotfiles/lspconfigs/dart.lua +++ b/nvim/dotfiles/lspconfigs/dart.lua @@ -1,5 +1,4 @@ -local lspconfig = require('lspconfig') +local ignition = require("dotfiles.lsp.ignition") +local dartls_config = require("lspconfig.server_configurations.dartls").default_config -local bin_name = 'dart' - -lspconfig['dartls'].setup({}) +ignition.setup_config("dartls", dartls_config) diff --git a/nvim/dotfiles/lspconfigs/php.lua b/nvim/dotfiles/lspconfigs/php.lua index fd01699..2effbad 100644 --- a/nvim/dotfiles/lspconfigs/php.lua +++ b/nvim/dotfiles/lspconfigs/php.lua @@ -1,3 +1,4 @@ -local lspconfig = require('lspconfig') +local ignition = require("dotfiles.lsp.ignition") +local phpactor_config = require("lspconfig.server_configurations.phpactor").default_config -lspconfig['phpactor'].setup({}) +ignition.setup_config("phpactor", phpactor_config)