update config for nvim 0.12, switch treesitter to main

Author: fcying

.github/workflows/release.yml

@@ -4,7 +4,7 @@ on:
   schedule:
   - cron: '0 20 * * *'
   push:
-    branches: [ master, test ]
+    branches: [ main, test ]
   workflow_dispatch:
 
 defaults:
@@ -36,10 +36,7 @@ jobs:
           cd ~/.config
 
           echo "install plugins===================="
-          # set treesitter ensure_install sync install
-          # sed 's|sync_install = false|sync_install = true|' -i ~/.config/nvim/lua/plugins/treesitter.lua
           nvim --headless "+Lazy! sync" +qa
-          # sed 's|sync_install = true|sync_install = false|' -i ~/.config/nvim/lua/plugins/treesitter.lua
 
           XZ_OPT=-9 tar cJf nvim_config.txz --exclude .git nvim
           mv ./*.txz ~/publish
@@ -48,6 +45,7 @@ jobs:
         run: |
           cd ~/.config
           echo "install vendor===================="
+          nvim --headless -c 'MasonInstall --sync tree-sitter-cli' -c qall
           nvim --headless -c 'MasonInstall --sync lua-language-server' -c qall
           nvim --headless -c 'MasonInstall --sync clangd' -c qall
 

.github/workflows/workflow_run_pruner.yml

@@ -4,7 +4,7 @@ on:
   # schedule:
   # - cron: '15 19 1 * *'
   #push:
-  #  branches: [ master ]
+  #  branches: [ main ]
   workflow_dispatch:
 
 jobs:

build/vim_build.sh

@@ -74,8 +74,8 @@ compdef _gar gar
 alias gb='git branch'
 alias gba='git branch -a'
 alias gbd='git branch -d'
-alias gbda='git branch --no-color --merged | command grep -vE "^(\*|\s*(master|develop|dev)\s*$)" | command xargs -n 1 git branch -d'
-alias gbDa='git branch --no-color | command grep -vE "^(\*|\s*(master|develop|dev)\s*$)" | command xargs -n 1 git branch -D'
+alias gbda='git branch --no-color --merged | command grep -vE "^(\*|\s*(master|main|dev)\s*$)" | command xargs -n 1 git branch -d'
+alias gbDa='git branch --no-color | command grep -vE "^(\*|\s*(master|main|dev)\s*$)" | command xargs -n 1 git branch -D'
 alias gbD='git branch -D'
 alias gbl='git blame -b -w'
 alias gbnm='git branch --no-merged'
@@ -100,7 +100,7 @@ alias gcf='git config --list'
 alias gcl='git clone --recurse-submodules'
 alias gclean='git clean -fd'
 alias gpristine='git reset --hard && git clean -dfx'
-alias gcm='git checkout master'
+alias gcm='git checkout main'
 alias gcd='git checkout develop'
 alias gcmsg='git commit -m'
 alias gco='git checkout'
@@ -232,10 +232,10 @@ alias glS='git log --source -S'
 compdef _git glp=git-log
 
 alias gm='git merge'
-alias gmom='git merge origin/master'
+alias gmom='git merge origin/main'
 alias gmt='git mergetool --no-prompt'
 alias gmtvim='git mergetool --no-prompt --tool=vimdiff'
-alias gmum='git merge upstream/master'
+alias gmum='git merge upstream/main'
 alias gma='git merge --abort'
 
 alias gp='git push'
@@ -254,7 +254,7 @@ alias grba='git rebase --abort'
 alias grbc='git rebase --continue'
 alias grbd='git rebase develop'
 alias grbi='git rebase -i'
-alias grbm='git rebase master'
+alias grbm='git rebase main'
 alias grbs='git rebase --skip'
 alias grh='git reset'
 alias grhh='git reset --hard'
@@ -295,7 +295,7 @@ alias gup='git pull --rebase'
 alias gupv='git pull --rebase -v'
 alias gupa='git pull --rebase --autostash'
 alias gupav='git pull --rebase --autostash -v'
-alias glum='git pull upstream master'
+alias glum='git pull upstream main'
 
 alias gwch='git whatchanged -p --abbrev-commit --pretty=medium'
 alias gwip='git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify -m "--wip-- [skip ci]"'

etc/git.zsh

@@ -185,7 +185,5 @@ vim.api.nvim_create_autocmd("FileType", {
 
 -- RemoveLsplog {{{
 vim.api.nvim_create_user_command("RemoveLsplog", function()
-    vim.fn.writefile({}, vim.lsp.get_log_path())
+    vim.fn.writefile({}, vim.lsp.log.get_filename())
 end, {})
-
-vim.cmd([[ autocmd FileType qf wincmd J ]])

lua/config/keymap.lua

@@ -22,7 +22,8 @@ local plugins = {
 
     -- editor {{{
     { import = "plugins.sleuth" },
-    { import = "plugins.comment" },
+    -- { import = "plugins.comment" },
+    { import = "plugins.ts_comments" },
     { import = "plugins.window_picker" },
     -- { import = "plugins.incline" },
     -- { import = "plugins.tagbar" },
@@ -44,6 +45,7 @@ local plugins = {
     require("plugins.telescope").setup,
     require("plugins.snacks").setup,
     { import = "plugins.action_preview" },
+    { import = "plugins.atone" },
     -- { import = "plugins.opencode" },
     -- { "Yggdroot/LeaderF", cmd = { "Leaderf" }, build = ":LeaderfInstallCExtension" },
     { "chrisbra/Colorizer", cmd = { "ColorToggle" } },
@@ -83,7 +85,6 @@ local plugins = {
     -- { import = "plugins.tiny_inline_diagnostic" },
     {
         "neovim/nvim-lspconfig",
-        cmd = { "LspInfo", "LspInstall", "LspStart", "LspRestart" },
         event = { "BufReadPre", "BufNewFile" },
         config = require("config.lsp").setup,
         dependencies = {
@@ -95,6 +96,10 @@ local plugins = {
 -- lazy config {{{
 require("lazy").setup(plugins, {
     root = g.plug_dir,
+    rocks = {
+        enabled = false,
+        hererocks = false,
+    },
     checker = {
         enabled = false,
         notify = true,

lua/config/lazy.lua

@@ -165,18 +165,18 @@ function configs.lua()
     -- :lua vim.print(vim.lsp.get_clients({ name = "lua_ls" })[1].config.settings.Lua)
     -- vim.g.lazydev_enabled = false
     local opts = {
+        root_markers = {
+            ".root",
+            ".luarc.json",
+            ".luarc.jsonc",
+            ".luacheckrc",
+            ".stylua.toml",
+            "stylua.toml",
+            "selene.toml",
+            "selene.yml",
+            ".git",
+        },
         settings = {
-            root_markers = {
-                ".root",
-                ".luarc.json",
-                ".luarc.jsonc",
-                ".luacheckrc",
-                ".stylua.toml",
-                "stylua.toml",
-                "selene.toml",
-                "selene.yml",
-                ".git",
-            },
             Lua = {
                 semantic = {
                     enable = true,
@@ -248,6 +248,13 @@ end
 function M.setup()
     -- lsp.set_log_level('debug')
 
+    vim.api.nvim_create_user_command("LspRestart", function()
+        util.lspRestart();
+    end, { desc = "Restart LSP clients" })
+    vim.api.nvim_create_user_command("LspInfo", function()
+        vim.cmd("checkhealth lsp")
+    end, { desc = "Alias for checkhealth lsp" })
+
     vim.api.nvim_create_autocmd("LspAttach", {
         callback = lspAttch
     })

lua/config/lsp.lua

@@ -41,38 +41,6 @@ function M.indent()
     return ret
 end
 
-function M.lsp_progress()
-    --local msg = vim.lsp.util.get_progress_messages()
-    local msg = {}
-    for _, client in ipairs(vim.lsp.get_clients()) do
-        for progress in client.progress do
-            local value = progress.value
-            if type(value) == "table" and value.kind then
-                msg.name = client.name
-                msg.message = value.message
-                msg.title = value.title
-                msg.kind = value.kind
-                if value.kind == "end" then
-                    msg.percentage = 100
-                else
-                    msg.percentage = value.percentage
-                end
-            end
-        end
-    end
-
-    if vim.tbl_count(msg) > 0 then
-        --vim.print(msg)
-
-        return (msg.name or "")
-            .. (msg.title and (" " .. msg.title) or "")
-            .. (msg.message and (" " .. msg.message) or "")
-            .. (msg.percentage and (" " .. msg.percentage .. "%%") or "")
-    end
-
-    return ""
-end
-
 function M.search()
     if vim.v.hlsearch == 1 then
         local ok, searchcount = pcall(vim.fn.searchcount)

lua/config/statusline.lua

@@ -0,0 +1,7 @@
+return {
+    "XXiaoA/atone.nvim",
+    cmd = "Atone",
+    ---@module "atone"
+    ---@type AtoneConfig
+    opts = {},
+}