update spell

rarely used and it changes the conceal settings

after/ftplugin/cpp.vim

@@ -1,10 +1,5 @@
 set commentstring=//\ %s
 
-set tabstop=2       " number of visual spaces per TAB
-set softtabstop=2   " number of spaces in tab when editing
-set shiftwidth=2    " number of spaces to use for autoindent
-set expandtab       " expand tab to spaces so that tabs are spaces
-
 " Disable inserting comment leader after hitting o or O or <Enter>
 set formatoptions-=o
 set formatoptions-=r

after/ftplugin/javascript.vim

@@ -1,8 +1,3 @@
 " Disable inserting comment leader after hitting o or O or <Enter>
 set formatoptions-=o
 set formatoptions-=r
-
-set tabstop=2       " number of visual spaces per TAB
-set softtabstop=2   " number of spaces in tab when editing
-set shiftwidth=2    " number of spaces to use for autoindent
-set expandtab       " expand tab to spaces so that tabs are spaces

after/ftplugin/lua.vim

@@ -2,11 +2,6 @@
 set formatoptions-=o
 set formatoptions-=r
 
-set tabstop=2       " number of visual spaces per TAB
-set softtabstop=2   " number of spaces in tab when editing
-set shiftwidth=2    " number of spaces to use for autoindent
-set expandtab       " expand tab to spaces so that tabs are spaces
-
 nnoremap <silent> <F9> :luafile %<CR>
 
 " For delimitMate

after/ftplugin/python.vim

@@ -8,5 +8,10 @@ set sidescroll=5
 set sidescrolloff=2
 set colorcolumn=100
 
+set tabstop=4       " number of visual spaces per TAB
+set softtabstop=4   " number of spaces in tab when editing
+set shiftwidth=4    " number of spaces to use for autoindent
+set expandtab       " expand tab to spaces so that tabs are spaces
+
 " For delimitMate
 let b:delimitMate_matchpairs = "(:),[:],{:}"

after/ftplugin/toml.vim

@@ -1,4 +0,0 @@
-set tabstop=2       " number of visual spaces per TAB
-set softtabstop=2   " number of spaces in tab when editing
-set shiftwidth=2    " number of spaces to use for autoindent
-set expandtab       " expand tab to spaces so that tabs are spaces

after/ftplugin/vim.vim

@@ -12,9 +12,4 @@ set foldmethod=expr foldexpr=utils#VimFolds(v:lnum) foldtext=utils#MyFoldText()
 " see `:h K` and https://stackoverflow.com/q/15867323/6064933
 set keywordprg=:help
 
-set tabstop=2       " number of visual spaces per TAB
-set softtabstop=2   " number of spaces in tab when editing
-set shiftwidth=2    " number of spaces to use for autoindent
-set expandtab       " expand tab to spaces so that tabs are spaces
-
 nnoremap <silent> <F9> :source %<CR>

after/ftplugin/yaml.vim

@@ -1,8 +1,3 @@
-set tabstop=2       " number of visual spaces per TAB
-set softtabstop=2   " number of spaces in tab when editing
-set shiftwidth=2    " number of spaces to use for autoindent
-set expandtab       " expand tab to spaces so that tabs are spaces
-
 " Turn off syntax highlighting for large YAML files.
 if line('$') > 500
   setlocal syntax=OFF

core/globals.lua

@@ -43,9 +43,7 @@ vim.g.mapleader = ','
 vim.g.vimsyn_embed = 'l'
 
 -- Use English as main language
-if not vim.g.is_mac then
-  vim.cmd [[language en_US.utf-8]]
-end
+vim.cmd [[language en_US.UTF-8]]
 
 -- Disable loading certain plugins
 

core/mappings.lua

@@ -85,16 +85,15 @@ keymap.set("n", "<leader>ev", "<cmd>tabnew $MYVIMRC <bar> tcd %:h<cr>", {
   desc = "open init.lua",
 })
 
-keymap.set("n", "<leader>sv", "", {
-  silent = true,
-  desc = "reload init.lua",
-  callback = function()
+keymap.set("n", "<leader>sv", function()
   vim.cmd([[
       update $MYVIMRC
       source $MYVIMRC
     ]])
   vim.notify("Nvim config successfully reloaded!", vim.log.levels.INFO, { title = "nvim-config" })
-  end,
+end, {
+  silent = true,
+  desc = "reload init.lua",
 })
 
 -- Reselect the text that has just been pasted, see also https://stackoverflow.com/a/4317090/6064933.
@@ -173,25 +172,23 @@ keymap.set({ "x", "o" }, "iu", "<cmd>call text_obj#URL()<cr>", { desc = "URL tex
 keymap.set({ "x", "o" }, "iB", "<cmd>call text_obj#Buffer()<cr>", { desc = "buffer text object" })
 
 -- Do not move my cursor when joining lines.
-keymap.set("n", "J", "", {
-  desc = "join line",
-  callback = function()
+keymap.set("n", "J", function()
   vim.cmd([[
       normal! mzJ`z
       delmarks z
     ]])
-  end,
+end, {
+  desc = "join line",
 })
 
-keymap.set("n", "gJ", "mzgJ`z", {
-  desc = "join visual lines",
-  callback = function()
+keymap.set("n", "gJ", function()
   -- we must use `normal!`, otherwise it will trigger recursive mapping
   vim.cmd([[
       normal! zmgJ`z
       delmarks z
     ]])
-  end,
+end, {
+  desc = "join visual lines",
 })
 
 -- Break inserted text into smaller undo units when we insert some punctuation chars.

core/options.vim

@@ -44,9 +44,9 @@ set backup  " create backup for files
 set backupcopy=yes  " copy the original file to backupdir and overwrite it
 
 " General tab settings
-set tabstop=4       " number of visual spaces per TAB
-set softtabstop=4   " number of spaces in tab when editing
-set shiftwidth=4    " number of spaces to use for autoindent
+set tabstop=2       " number of visual spaces per TAB
+set softtabstop=2   " number of spaces in tab when editing
+set shiftwidth=2    " number of spaces to use for autoindent
 set expandtab       " expand tab to spaces so that tabs are spaces
 
 " Set matching pairs of characters and highlight matching brackets
@@ -75,6 +75,7 @@ set scrolloff=3
 " Use mouse to select and resize windows, etc.
 set mouse=nic  " Enable mouse in several mode
 set mousemodel=popup  " Set the behaviour of mouse
+set mousescroll=ver:1,hor:6
 
 " Disable showing current mode on command line since statusline plugins can show it.
 set noshowmode

lua/config/dashboard-nvim.lua

@@ -1,3 +1,5 @@
+local api = vim.api
+local keymap = vim.keymap
 local dashboard = require("dashboard")
 
 dashboard.custom_header = {
@@ -56,10 +58,11 @@ dashboard.custom_center = {
   },
 }
 
-vim.cmd([[
-  augroup dashboard_enter
-    au!
-    autocmd FileType dashboard nnoremap <buffer> q :qa<CR>
-    autocmd FileType dashboard nnoremap <buffer> e :enew<CR>
-  augroup END
-]])
+api.nvim_create_autocmd("FileType", {
+  pattern = "dashboard",
+  group = api.nvim_create_augroup("dashboard_enter", { clear = true }),
+  callback = function ()
+    keymap.set("n", "q", ":qa<CR>", { buffer = true, silent = true })
+    keymap.set("n", "e", ":enew<CR>", { buffer = true, silent = true })
+  end
+})

lua/config/hlslens.lua

@@ -34,5 +34,15 @@ keymap.set("n", "N", "", {
   end,
 })
 
-keymap.set("n", "*", "<Plug>(asterisk-z*)<Cmd>lua require('hlslens').start()<CR>")
-keymap.set("n", "#", "<Plug>(asterisk-z#)<Cmd>lua require('hlslens').start()<CR>")
+keymap.set("n", "*", "", {
+  callback = function()
+    vim.fn.execute("normal! *N")
+    hlslens.start()
+  end,
+})
+keymap.set("n", "#", "", {
+  callback = function()
+    vim.fn.execute("normal! #N")
+    hlslens.start()
+  end,
+})

lua/config/lsp.lua

@@ -69,12 +69,24 @@ local custom_attach = function(client, bufnr)
       hi! link LspReferenceRead Visual
       hi! link LspReferenceText Visual
       hi! link LspReferenceWrite Visual
-      augroup lsp_document_highlight
-        autocmd! * <buffer>
-        autocmd CursorHold <buffer> lua vim.lsp.buf.document_highlight()
-        autocmd CursorMoved <buffer> lua vim.lsp.buf.clear_references()
-      augroup END
     ]])
+
+    local gid = api.nvim_create_augroup("lsp_document_highlight", { clear = true })
+    api.nvim_create_autocmd("CursorHold" , {
+      group = gid,
+      buffer = bufnr,
+      callback = function ()
+        lsp.buf.document_highlight()
+      end
+    })
+
+    api.nvim_create_autocmd("CursorMoved" , {
+      group = gid,
+      buffer = bufnr,
+      callback = function ()
+        lsp.buf.clear_references()
+      end
+    })
   end
 
   if vim.g.logging_level == "debug" then
@@ -83,9 +95,7 @@ local custom_attach = function(client, bufnr)
   end
 end
 
-local capabilities = lsp.protocol.make_client_capabilities()
-capabilities = require("cmp_nvim_lsp").update_capabilities(capabilities)
-capabilities.textDocument.completion.completionItem.snippetSupport = true
+local capabilities = require('cmp_nvim_lsp').default_capabilities()
 
 local lspconfig = require("lspconfig")
 

lua/plugins.lua

@@ -4,24 +4,31 @@ local fn = vim.fn
 -- The root dir to install all plugins. Plugins are under opt/ or start/ sub-directory.
 vim.g.plugin_home = fn.stdpath("data") .. "/site/pack/packer"
 
--- Where to install packer.nvim -- the package manager (we make it opt)
-local packer_dir = vim.g.plugin_home .. "/opt/packer.nvim"
+--- Install packer if it has not been installed.
+--- Return:
+--- true: if this is a fresh install of packer
+--- false: if packer has been installed
+local function packer_ensure_install()
+  -- Where to install packer.nvim -- the package manager (we make it opt)
+  local packer_dir = vim.g.plugin_home .. "/opt/packer.nvim"
 
--- Whether this is a fresh install, i.e., packer itself and plugins have not been installed.
-local fresh_install = false
+  if fn.glob(packer_dir) ~= "" then
+    return false
+  end
 
--- Auto-install packer in case it hasn't been installed.
-if fn.glob(packer_dir) == "" then
-  fresh_install = true
+  -- Auto-install packer in case it hasn't been installed.
+  vim.api.nvim_echo({ { "Installing packer.nvim", "Type" } }, true, {})
 
-  -- Now we need to install packer.nvim first.
   local packer_repo = "https://github.com/wbthomason/packer.nvim"
   local install_cmd = string.format("!git clone --depth=1 %s %s", packer_repo, packer_dir)
-
-  vim.api.nvim_echo({ { "Installing packer.nvim", "Type" } }, true, {})
   vim.cmd(install_cmd)
+
+  return true
 end
 
+
+local fresh_install = packer_ensure_install()
+
 -- Load packer.nvim
 vim.cmd("packadd packer.nvim")
 
@@ -99,9 +106,6 @@ packer.startup {
       config = [[require('config.hlslens')]],
     }
 
-    -- Stay after pressing * and search selected text
-    use { "haya14busa/vim-asterisk", event = "VimEnter" }
-
     -- File search, tag search and more
     if vim.g.is_win then
       use { "Yggdroot/LeaderF", cmd = "Leaderf" }
@@ -255,9 +259,6 @@ packer.startup {
     -- Vim tabular plugin for manipulate tabular, required by markdown plugins
     use { "godlygeek/tabular", cmd = { "Tabularize" } }
 
-    -- Markdown JSON header highlight plugin
-    use { "elzr/vim-json", ft = { "json", "markdown" } }
-
     -- Markdown previewing (only for Mac and Windows)
     if vim.g.is_win or vim.g.is_mac then
       use {

spell/en.utf-8.add

@@ -440,3 +440,15 @@ Postgres
 plpgsql
 postgres
 PySpark
+winbar
+cmdline
+shada
+async
+localhost
+JetBrains
+localhost
+MariaDB
+SQLite
+Pgadmin
+Datagrip
+mysql