diff --git a/group_vars/arch/neovim.yml b/group_vars/arch/neovim.yml index de53353..16b1284 100644 --- a/group_vars/arch/neovim.yml +++ b/group_vars/arch/neovim.yml @@ -1,48 +1,48 @@ language_servers: - package: ansible-language-server - server_name: 'ansiblels' + server_name: "ansiblels" auto_setup: true - package: typescript-language-server - server_name: 'ts_ls' + server_name: "ts_ls" auto_setup: true - package: vscode-json-languageserver - server_name: 'jsonls' + server_name: "jsonls" auto_setup: true - package: vscode-css-languageserver - server_name: 'cssls' + server_name: "cssls" auto_setup: true - package: bash-language-server - server_name: 'bashls' + server_name: "bashls" auto_setup: true - package: marksman - server_name: 'marksman' + server_name: "marksman" auto_setup: true - package: esbonio - server_name: 'esbonio' + server_name: "esbonio" auto_setup: true - package: lua-language-server - server_name: 'lua_ls' + server_name: "lua_ls" auto_setup: false - package: yaml-language-server - server_name: 'yamlls' + server_name: "yamlls" auto_setup: false - package: vscode-html-languageserver - server_name: 'html' + server_name: "html" auto_setup: false - - package: ruff-lsp - server_name: 'ruff' - auto_setup: false + - package: ruff + server_name: "ruff" + auto_setup: true - package: pyright - server_name: 'pyright' + server_name: "pyright" auto_setup: false diff --git a/templates/gitconfig.j2 b/templates/gitconfig.j2 index 84f97da..3054313 100644 --- a/templates/gitconfig.j2 +++ b/templates/gitconfig.j2 @@ -4,6 +4,9 @@ email = {{ git_email }} name = {{ git_name }} +[gpg] +format = ssh + [core] editor = nvim {% if ansible_facts['os_family'] == 'Archlinux' %} diff --git a/templates/nvim/lua/lsp.lua.j2 b/templates/nvim/lua/lsp.lua.j2 index 1da3fdc..f9d4202 100644 --- a/templates/nvim/lua/lsp.lua.j2 +++ b/templates/nvim/lua/lsp.lua.j2 @@ -53,19 +53,10 @@ end local util = require('lspconfig/util') {% if ansible_facts.os_family == 'Archlinux' %} -local python_root_dir = function(fname) - return util.root_pattern('.git', 'setup.cfg', 'requirements')(fname) or - util.path.dirname(fname) -end - -vim.lsp.config['ruff'] = { - on_attach = on_attach, - capabilities = capabilities, - root_dir = python_root_dir -} - vim.lsp.config['pyright'] = { + on_attach = on_attach, + capabilities = capabilities, settings = { pyright = { -- Using Ruff's import organizer