From 11f27e48698ebe1e87702b0ec679b23b03a6124b Mon Sep 17 00:00:00 2001
From: Sonny Bakker <sonny871@hotmail.com>
Date: Thu, 10 Nov 2022 21:57:08 +0100
Subject: [PATCH] Use `opt` instead of `b`

---
 templates/nvim/ftplugin/bash.lua.j2       | 10 +++++-----
 templates/nvim/ftplugin/css.lua.j2        | 10 +++++-----
 templates/nvim/ftplugin/html.lua.j2       | 10 +++++-----
 templates/nvim/ftplugin/htmldjango.lua.j2 | 10 +++++-----
 templates/nvim/ftplugin/javascript.lua.j2 | 10 +++++-----
 templates/nvim/ftplugin/json.lua.j2       | 10 +++++-----
 templates/nvim/ftplugin/lua.lua.j2        | 10 +++++-----
 templates/nvim/ftplugin/python.lua.j2     | 10 +++++-----
 templates/nvim/ftplugin/scss.lua.j2       | 10 +++++-----
 templates/nvim/ftplugin/sh.lua.j2         | 10 +++++-----
 templates/nvim/ftplugin/yaml.lua.j2       | 10 +++++-----
 templates/nvim/lua/lsp.lua.j2             |  2 +-
 12 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/templates/nvim/ftplugin/bash.lua.j2 b/templates/nvim/ftplugin/bash.lua.j2
index 265ae36..94362da 100644
--- a/templates/nvim/ftplugin/bash.lua.j2
+++ b/templates/nvim/ftplugin/bash.lua.j2
@@ -1,7 +1,7 @@
 -- {{ ansible_managed }} {{ ansible_date_time.time }} {{ ansible_date_time.date }}
 
-vim.b.tabstop = 4
-vim.b.softtabstop = 4
-vim.b.shiftwidth = 4
-vim.b.expandtab = true
-vim.b.autoindent = true
+vim.opt.tabstop = 4
+vim.opt.softtabstop = 4
+vim.opt.shiftwidth = 4
+vim.opt.expandtab = true
+vim.opt.autoindent = true
diff --git a/templates/nvim/ftplugin/css.lua.j2 b/templates/nvim/ftplugin/css.lua.j2
index a4c8de0..1de152e 100644
--- a/templates/nvim/ftplugin/css.lua.j2
+++ b/templates/nvim/ftplugin/css.lua.j2
@@ -1,7 +1,7 @@
 -- {{ ansible_managed }} {{ ansible_date_time.time }} {{ ansible_date_time.date }}
 
-vim.b.tabstop = 2
-vim.b.softtabstop = 2
-vim.b.shiftwidth = 2
-vim.b.expandtab = true
-vim.b.autoindent = true
+vim.opt.tabstop = 2
+vim.opt.softtabstop = 2
+vim.opt.shiftwidth = 2
+vim.opt.expandtab = true
+vim.opt.autoindent = true
diff --git a/templates/nvim/ftplugin/html.lua.j2 b/templates/nvim/ftplugin/html.lua.j2
index a4c8de0..1de152e 100644
--- a/templates/nvim/ftplugin/html.lua.j2
+++ b/templates/nvim/ftplugin/html.lua.j2
@@ -1,7 +1,7 @@
 -- {{ ansible_managed }} {{ ansible_date_time.time }} {{ ansible_date_time.date }}
 
-vim.b.tabstop = 2
-vim.b.softtabstop = 2
-vim.b.shiftwidth = 2
-vim.b.expandtab = true
-vim.b.autoindent = true
+vim.opt.tabstop = 2
+vim.opt.softtabstop = 2
+vim.opt.shiftwidth = 2
+vim.opt.expandtab = true
+vim.opt.autoindent = true
diff --git a/templates/nvim/ftplugin/htmldjango.lua.j2 b/templates/nvim/ftplugin/htmldjango.lua.j2
index a4c8de0..1de152e 100644
--- a/templates/nvim/ftplugin/htmldjango.lua.j2
+++ b/templates/nvim/ftplugin/htmldjango.lua.j2
@@ -1,7 +1,7 @@
 -- {{ ansible_managed }} {{ ansible_date_time.time }} {{ ansible_date_time.date }}
 
-vim.b.tabstop = 2
-vim.b.softtabstop = 2
-vim.b.shiftwidth = 2
-vim.b.expandtab = true
-vim.b.autoindent = true
+vim.opt.tabstop = 2
+vim.opt.softtabstop = 2
+vim.opt.shiftwidth = 2
+vim.opt.expandtab = true
+vim.opt.autoindent = true
diff --git a/templates/nvim/ftplugin/javascript.lua.j2 b/templates/nvim/ftplugin/javascript.lua.j2
index a4c8de0..1de152e 100644
--- a/templates/nvim/ftplugin/javascript.lua.j2
+++ b/templates/nvim/ftplugin/javascript.lua.j2
@@ -1,7 +1,7 @@
 -- {{ ansible_managed }} {{ ansible_date_time.time }} {{ ansible_date_time.date }}
 
-vim.b.tabstop = 2
-vim.b.softtabstop = 2
-vim.b.shiftwidth = 2
-vim.b.expandtab = true
-vim.b.autoindent = true
+vim.opt.tabstop = 2
+vim.opt.softtabstop = 2
+vim.opt.shiftwidth = 2
+vim.opt.expandtab = true
+vim.opt.autoindent = true
diff --git a/templates/nvim/ftplugin/json.lua.j2 b/templates/nvim/ftplugin/json.lua.j2
index 265ae36..94362da 100644
--- a/templates/nvim/ftplugin/json.lua.j2
+++ b/templates/nvim/ftplugin/json.lua.j2
@@ -1,7 +1,7 @@
 -- {{ ansible_managed }} {{ ansible_date_time.time }} {{ ansible_date_time.date }}
 
-vim.b.tabstop = 4
-vim.b.softtabstop = 4
-vim.b.shiftwidth = 4
-vim.b.expandtab = true
-vim.b.autoindent = true
+vim.opt.tabstop = 4
+vim.opt.softtabstop = 4
+vim.opt.shiftwidth = 4
+vim.opt.expandtab = true
+vim.opt.autoindent = true
diff --git a/templates/nvim/ftplugin/lua.lua.j2 b/templates/nvim/ftplugin/lua.lua.j2
index a4c8de0..1de152e 100644
--- a/templates/nvim/ftplugin/lua.lua.j2
+++ b/templates/nvim/ftplugin/lua.lua.j2
@@ -1,7 +1,7 @@
 -- {{ ansible_managed }} {{ ansible_date_time.time }} {{ ansible_date_time.date }}
 
-vim.b.tabstop = 2
-vim.b.softtabstop = 2
-vim.b.shiftwidth = 2
-vim.b.expandtab = true
-vim.b.autoindent = true
+vim.opt.tabstop = 2
+vim.opt.softtabstop = 2
+vim.opt.shiftwidth = 2
+vim.opt.expandtab = true
+vim.opt.autoindent = true
diff --git a/templates/nvim/ftplugin/python.lua.j2 b/templates/nvim/ftplugin/python.lua.j2
index 265ae36..94362da 100644
--- a/templates/nvim/ftplugin/python.lua.j2
+++ b/templates/nvim/ftplugin/python.lua.j2
@@ -1,7 +1,7 @@
 -- {{ ansible_managed }} {{ ansible_date_time.time }} {{ ansible_date_time.date }}
 
-vim.b.tabstop = 4
-vim.b.softtabstop = 4
-vim.b.shiftwidth = 4
-vim.b.expandtab = true
-vim.b.autoindent = true
+vim.opt.tabstop = 4
+vim.opt.softtabstop = 4
+vim.opt.shiftwidth = 4
+vim.opt.expandtab = true
+vim.opt.autoindent = true
diff --git a/templates/nvim/ftplugin/scss.lua.j2 b/templates/nvim/ftplugin/scss.lua.j2
index a4c8de0..1de152e 100644
--- a/templates/nvim/ftplugin/scss.lua.j2
+++ b/templates/nvim/ftplugin/scss.lua.j2
@@ -1,7 +1,7 @@
 -- {{ ansible_managed }} {{ ansible_date_time.time }} {{ ansible_date_time.date }}
 
-vim.b.tabstop = 2
-vim.b.softtabstop = 2
-vim.b.shiftwidth = 2
-vim.b.expandtab = true
-vim.b.autoindent = true
+vim.opt.tabstop = 2
+vim.opt.softtabstop = 2
+vim.opt.shiftwidth = 2
+vim.opt.expandtab = true
+vim.opt.autoindent = true
diff --git a/templates/nvim/ftplugin/sh.lua.j2 b/templates/nvim/ftplugin/sh.lua.j2
index 265ae36..94362da 100644
--- a/templates/nvim/ftplugin/sh.lua.j2
+++ b/templates/nvim/ftplugin/sh.lua.j2
@@ -1,7 +1,7 @@
 -- {{ ansible_managed }} {{ ansible_date_time.time }} {{ ansible_date_time.date }}
 
-vim.b.tabstop = 4
-vim.b.softtabstop = 4
-vim.b.shiftwidth = 4
-vim.b.expandtab = true
-vim.b.autoindent = true
+vim.opt.tabstop = 4
+vim.opt.softtabstop = 4
+vim.opt.shiftwidth = 4
+vim.opt.expandtab = true
+vim.opt.autoindent = true
diff --git a/templates/nvim/ftplugin/yaml.lua.j2 b/templates/nvim/ftplugin/yaml.lua.j2
index a4c8de0..1de152e 100644
--- a/templates/nvim/ftplugin/yaml.lua.j2
+++ b/templates/nvim/ftplugin/yaml.lua.j2
@@ -1,7 +1,7 @@
 -- {{ ansible_managed }} {{ ansible_date_time.time }} {{ ansible_date_time.date }}
 
-vim.b.tabstop = 2
-vim.b.softtabstop = 2
-vim.b.shiftwidth = 2
-vim.b.expandtab = true
-vim.b.autoindent = true
+vim.opt.tabstop = 2
+vim.opt.softtabstop = 2
+vim.opt.shiftwidth = 2
+vim.opt.expandtab = true
+vim.opt.autoindent = true
diff --git a/templates/nvim/lua/lsp.lua.j2 b/templates/nvim/lua/lsp.lua.j2
index 4b939bc..db9e1f3 100644
--- a/templates/nvim/lua/lsp.lua.j2
+++ b/templates/nvim/lua/lsp.lua.j2
@@ -27,7 +27,7 @@ local servers = { 'ansiblels', 'yamlls', 'cssls', 'jsonls', 'tsserver', }
 
 --add additional capabilities supported by nvim-cmp
 local capabilities = vim.lsp.protocol.make_client_capabilities()
-capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities)
+capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities)
 
 local nvim_lsp = require('lspconfig')