feat: migrate to nvim 0.12 configs

nvim/config/init.lua

@@ -1,54 +1,2 @@
-require('bootstrap')
 require('options')
-require('keymaps')
-require('syntax')
-
-vim.api.nvim_create_autocmd("BufWritePre", {
-  pattern = {"*.go"},
-  callback = function()
-    -- Format the file
-    vim.lsp.buf.format({
-      async = false,
-    })
-
-    -- Organize imports
-    local params = vim.lsp.util.make_range_params()
-    params.context = { only = { "source.organizeImports" } }
-
-    local result = vim.lsp.buf_request_sync(0, "textDocument/codeAction", params, 1000)
-    if not result then return end
-
-    for _, res in pairs(result) do
-      for _, action in pairs(res.result or {}) do
-        if action.edit then
-          vim.lsp.util.apply_workspace_edit(action.edit, "utf-16")
-        else
-          vim.lsp.buf.execute_command(action.command)
-        end
-      end
-    end
-  end
-})
-
-vim.api.nvim_create_autocmd("BufWritePre", {
-  pattern = {"*.tf"},
-  callback = function()
-    vim.lsp.buf.format()
-  end
-})
-
-vim.api.nvim_create_autocmd({"BufRead", "BufNewFile"}, {
-  pattern = "*.html",
-  command = "set filetype=html"
-})
-
-vim.api.nvim_create_autocmd("FileType", {
-  pattern = {"lua", "ruby", "yaml", "html", "json"},
-  callback = function ()
-    vim.opt_local.tabstop = 2
-    vim.opt_local.shiftwidth = 2
-    vim.opt_local.softtabstop = 2
-    vim.opt_local.expandtab = true
-    vim.opt_local.smartindent = true
-  end
-})
+require('autocmds')

nvim/config/lua/autocmds.lua

@@ -0,0 +1,20 @@
+vim.api.nvim_create_autocmd({"BufRead", "BufNewFile"}, {
+  pattern = "*.html",
+  command = "set filetype=html"
+})
+
+vim.api.nvim_create_autocmd("FileType", {
+  pattern = { "lua", "ruby", "yaml", "html", "json" },
+  callback = function()
+    local opts = {
+      tabstop = 2,
+      shiftwidth = 2,
+      softtabstop = 2,
+      expandtab = true,
+      smartindent = true,
+    }
+    for k, v in pairs(opts) do
+      vim.opt_local[k] = v
+    end
+  end
+})

nvim/config/lua/languages.lua

@@ -0,0 +1,37 @@
+return {
+  -- Build systems
+  { treesitter = "make" },
+  { treesitter = "cmake" },
+  { treesitter = "dockerfile" },
+
+  -- Scripting languages
+  { treesitter = "bash", lsp = "bashls" },
+  { treesitter = "lua", lsp = "lua_ls" },
+
+  -- Programming languages
+  { treesitter = "go", lsp = "gopls" },
+  { treesitter = "gomod" },
+  { treesitter = "gosum" },
+  { treesitter = "rust" },
+  { treesitter = "proto", lsp = "buf_ls" },
+  { treesitter = "zig", lsp = "zls" },
+  { treesitter = "gleam", lsp = "gleam" },
+  { treesitter = "elixir" },
+  { treesitter = "html" },
+  { treesitter = "css" },
+  { treesitter = "typescript", lsp = "ts_ls" },
+  { treesitter = "javascript" },
+
+  -- Data and documentation
+  { treesitter = "sql" },
+  { treesitter = "csv" },
+  { treesitter = "markdown", lsp = "marksman" },
+
+  -- Config and IaC
+  { treesitter = "terraform", lsp = "terraformls" },
+  { treesitter = "hcl" },
+  { treesitter = "json" },
+  { treesitter = "yaml" },
+  { treesitter = "toml" },
+  { treesitter = "regex" },
+}

nvim/config/lua/options.lua

@@ -1,3 +1,6 @@
+-- New UI opt-in
+require('vim._core.ui2').enable({})
+
 vim.opt.timeoutlen = 1000
 vim.opt.ttimeoutlen = 0
 vim.opt.number = true
@@ -12,7 +15,6 @@ vim.opt.cursorline = true
 vim.opt.cursorcolumn = true
 vim.opt.autowrite = true
 vim.opt.shortmess = vim.opt.shortmess + 'c'
-vim.opt.completeopt = {'menuone', 'noinsert', 'noselect'}
 vim.opt.incsearch = true -- show search matches as you type
 vim.opt.showmatch = true
 vim.opt.hlsearch = true
@@ -32,6 +34,3 @@ vim.opt.spell = false
 
 -- Change how diagnostics appear
 vim.diagnostic.config({ virtual_text = true })
-
--- Theme
-vim.cmd.colorscheme('base16-gruvbox-dark-hard')