modules/home/vim/plugin/numbertoggle.lua

@@ -7,28 +7,17 @@ local numbertoggle = vim.api.nvim_create_augroup("numbertoggle", { clear = true
 vim.api.nvim_create_autocmd({ "BufEnter", "FocusGained", "InsertLeave", "WinEnter" }, {
     pattern = "*",
     group = numbertoggle,
-    callback = function()
-        if vim.opt.number:get() then
-            vim.opt.relativenumber = true
-        end
-    end,
+    command = "if &nu | setlocal rnu | endif",
 })
 vim.api.nvim_create_autocmd({ "BufLeave", "FocusLost", "InsertEnter", "WinLeave" }, {
     pattern = "*",
     group = numbertoggle,
-    callback = function()
-        if vim.opt.number:get() then
-            vim.opt.relativenumber = false
-        end
-    end,
+    command = "if &nu | setlocal nornu | endif",
 })
 
 -- Never show the sign column in a terminal buffer
 vim.api.nvim_create_autocmd({ "TermOpen" }, {
     pattern = "*",
     group = numbertoggle,
-    callback = function()
-        vim.opt.number = false
-        vim.opt.relativenumber = false
-    end,
+    command = "setlocal nonu nornu",
 })

modules/home/vim/plugin/signtoggle.lua

@@ -4,23 +4,17 @@ local signtoggle = vim.api.nvim_create_augroup("signtoggle", { clear = true })
 vim.api.nvim_create_autocmd({ "BufEnter", "FocusGained", "WinEnter" }, {
     pattern = "*",
     group = signtoggle,
-    callback = function()
-        vim.opt.signcolumn = "yes"
-    end,
+    command = "setlocal signcolumn=yes",
 })
 vim.api.nvim_create_autocmd({ "BufLeave", "FocusLost", "WinLeave" }, {
     pattern = "*",
     group = signtoggle,
-    callback = function()
-        vim.opt.signcolumn = "no"
-    end,
+    command = "setlocal signcolumn=yes",
 })
 
 -- Never show the sign column in a terminal buffer
 vim.api.nvim_create_autocmd({ "TermOpen" }, {
     pattern = "*",
     group = signtoggle,
-    callback = function()
-        vim.opt.signcolumn = "no"
-    end,
+    command = "setlocal signcolumn=no",
 })