dotfiles

commit 42ca1a5b4b8173d929caf29adf1ddb6f554b9439
parent d2de7d5841fc50910dec0daeb66d51ed2b9af6ad
Author: Chris Bracken <chris@bracken.jp>
Date:   Fri, 19 Sep 2025 19:49:34 +0900

nvim: clean up cursorline/colorcolumn settings

Diffstat:
A
.config/nvim/after/ftplugin/java.lua
 | 
2
++
A
.config/nvim/after/ftplugin/m.lua
 | 
2
++
A
.config/nvim/after/ftplugin/mm.lua
 | 
2
++
M
.config/nvim/after/ftplugin/python.lua
 | 
2
++
M
.config/nvim/after/ftplugin/swift.lua
 | 
2
++
M
.config/nvim/lua/config/colorscheme.lua
 | 
41
++++++++++-------------------------------

6 files changed, 20 insertions(+), 31 deletions(-)
diff --git a/.config/nvim/after/ftplugin/java.lua b/.config/nvim/after/ftplugin/java.lua
@@ -0,0 +1,2 @@
+vim.opt_local.colorcolumn = "100"
+vim.opt_local.textwidth = 100
diff --git a/.config/nvim/after/ftplugin/m.lua b/.config/nvim/after/ftplugin/m.lua
@@ -0,0 +1,2 @@
+vim.opt_local.colorcolumn = "100"
+vim.opt_local.textwidth = 100
diff --git a/.config/nvim/after/ftplugin/mm.lua b/.config/nvim/after/ftplugin/mm.lua
@@ -0,0 +1,2 @@
+vim.opt_local.colorcolumn = "100"
+vim.opt_local.textwidth = 100
diff --git a/.config/nvim/after/ftplugin/python.lua b/.config/nvim/after/ftplugin/python.lua
@@ -2,3 +2,5 @@ vim.opt_local.tabstop = 2
 vim.opt_local.shiftwidth = 2
 vim.opt_local.softtabstop = 2
 vim.opt_local.expandtab = true
+vim.opt_local.colorcolumn = "88"
+vim.opt_local.textwidth = 88
diff --git a/.config/nvim/after/ftplugin/swift.lua b/.config/nvim/after/ftplugin/swift.lua
@@ -2,3 +2,5 @@ vim.opt_local.tabstop = 2
 vim.opt_local.shiftwidth = 2
 vim.opt_local.softtabstop = 2
 vim.opt_local.expandtab = true
+vim.opt_local.colorcolumn = "100"
+vim.opt_local.textwidth = 100
diff --git a/.config/nvim/lua/config/colorscheme.lua b/.config/nvim/lua/config/colorscheme.lua
@@ -3,39 +3,18 @@ if vim.fn.has('termguicolors') == 1 then
   vim.opt.cursorline = true            -- Highlight cursor line, max column.
   vim.opt.termguicolors = true         -- Enable 24-bit colour.
 
-  vim.api.nvim_create_autocmd({'WinLeave'}, {
-    pattern = '*',
-    command = 'setlocal nocursorline'
+  vim.api.nvim_create_autocmd({ "WinEnter", "BufEnter" }, {
+    callback = function()
+      vim.opt_local.cursorline = true
+    end,
   })
-  vim.api.nvim_create_autocmd({'WinEnter'}, {
-    pattern = '*',
-    command = 'setlocal cursorline'
-  })
-  vim.api.nvim_create_autocmd({'BufLeave'}, {
-    pattern = '*',
-    command = 'setlocal nocursorline'
-  })
-  vim.api.nvim_create_autocmd({'BufEnter'}, {
-    pattern = '*',
-    command = 'setlocal cursorline'
+  vim.api.nvim_create_autocmd({ "WinLeave", "BufLeave" }, {
+    callback = function()
+      vim.opt_local.cursorline = false
+    end,
   })
 
   -- Highlight over-length lines.
-  vim.api.nvim_create_autocmd({'BufEnter', 'InsertLeave'}, {
-    pattern = '*',
-    command = 'set colorcolumn=80'
-  })
-  vim.api.nvim_create_autocmd({'BufEnter', 'InsertLeave'}, {
-    pattern = {'*.txt', '*.md'},
-    command = 'set colorcolumn=80 | set textwidth=80'
-  })
-  vim.api.nvim_create_autocmd({'BufEnter', 'InsertLeave'}, {
-    pattern = {'*.py'},
-    command = 'set colorcolumn=88 | set textwidth=88'
-  })
-  vim.api.nvim_create_autocmd({'BufEnter', 'InsertLeave'}, {
-    pattern = {'*.java', '*.m', '*.mm', '*.swift'},
-    command = 'set colorcolumn=100 | set textwidth=100'
-  })
+  vim.opt_local.colorcolumn = "80"
+  vim.opt_local.textwidth = 80
 end
-