diff --git a/playbook.yml b/playbook.yml index 6c35a0f..5e51b97 100644 --- a/playbook.yml +++ b/playbook.yml @@ -25,7 +25,7 @@ package_facts: manager: pacman - import_tasks: 'tasks/aur.yml' - when: aur_packages|map(attribute='name')|list is not subset(ansible_facts.packages) + when: aur_packages|map(attribute='package_name')|list is not subset(ansible_facts.packages) - import_tasks: 'tasks/docker.yml' vars_files: - 'vars.yml' diff --git a/tasks/neovim.yml b/tasks/neovim.yml index 4de66b7..e12c36b 100644 --- a/tasks/neovim.yml +++ b/tasks/neovim.yml @@ -31,7 +31,7 @@ npm: name: '{{ item }}' global: true - loop: '{{ language_servers }}' + loop: '{{ language_servers + neovim_node_packages }}' - name: remove old neovim configuration file file: @@ -97,10 +97,7 @@ src: 'templates/nvim/ftplugin/yaml.lua.j2', dest: '{{ xdg_config_dir }}/nvim/after/ftplugin/yaml.lua', } - - { - src: 'templates/nvim/init.lua.j2', - dest: '{{ xdg_config_dir }}/nvim/init.lua', - } + - { src: 'templates/nvim/init.lua.j2', dest: '{{ xdg_config_dir }}/nvim/init.lua' } - { src: 'templates/nvim/lua/auto-commands.lua.j2', dest: '{{ xdg_config_dir }}/nvim/lua/auto-commands.lua', @@ -125,4 +122,3 @@ src: 'templates/nvim/lua/tree-sitter.lua.j2', dest: '{{ xdg_config_dir }}/nvim/lua/tree-sitter.lua', } - diff --git a/templates/nvim/lua/lsp.lua.j2 b/templates/nvim/lua/lsp.lua.j2 index 707d127..58e1140 100644 --- a/templates/nvim/lua/lsp.lua.j2 +++ b/templates/nvim/lua/lsp.lua.j2 @@ -28,7 +28,14 @@ local nvim_lsp = require('lspconfig') --enable some language servers with the additional completion capabilities --offered by nvim-cmp -local servers = { 'ansiblels', 'yamlls', 'cssls', 'jsonls', } +local servers = { 'ansiblels', 'yamlls', 'cssls', 'jsonls', 'tsserver', } + +for _, lsp in ipairs(servers) do + nvim_lsp[lsp].setup { + on_attach = on_attach, + capabilities = capabilities, + } +end local util = require("lspconfig/util") @@ -46,10 +53,3 @@ nvim_lsp.html.setup({ capabilities = capabilities, filetypes = { 'html', 'htmldjango' }, }) - -for _, lsp in ipairs(servers) do - nvim_lsp[lsp].setup { - on_attach = on_attach, - capabilities = capabilities, - } -end diff --git a/vars.yml b/vars.yml index 9d40ab3..565048a 100644 --- a/vars.yml +++ b/vars.yml @@ -17,10 +17,15 @@ packages: - ripgrep aur_packages: - - { url: 'https://aur.archlinux.org/rootlesskit.git', name: 'rootlesskit' } + - { + url: 'https://aur.archlinux.org/rootlesskit.git', + name: 'rootlesskit', + package_name: 'rootlesskit', + } - { url: 'https://aur.archlinux.org/docker-rootless-extras-bin.git', name: 'docker-rootless', + package_name: 'docker-rootless-extras-bin', } aur_build_dir: '/usr/local/src' @@ -52,11 +57,15 @@ vim_plugins: version: '0.1.x', } +neovim_node_packages: + - typescript + language_servers: - pyright - ansible-language-server - yaml-language-server - vscode-langservers-extracted + - typescript-language-server gitlab_domain: 'git.fudiggity.nl' gitlab_host_key: 'git.fudiggity.nl ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICNmvcxza79T7JZMkifmquwXH/kMUqDnKs9Oob+JrRvn'