update nvim-tree conf

nvim-tree: fix shortcut and repo

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018-2022 jdhao
+Copyright (c) 2018-2023 jdhao
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -69,7 +69,7 @@ and how to set up on different platforms (Linux, macOS, and Windows).
 + Fast buffer jump via [hop.nvim](https://github.com/phaazon/hop.nvim).
 + Powerful snippet insertion via [Ultisnips](https://github.com/SirVer/ultisnips).
 + Beautiful statusline via [lualine.nvim](https://github.com/nvim-lualine/lualine.nvim).
-+ File tree explorer via [nvim-tree.lua](https://github.com/kyazdani42/nvim-tree.lua).
++ File tree explorer via [nvim-tree.lua](https://github.com/nvim-tree/nvim-tree.lua).
 + Better quickfix list with [nvim-bqf](https://github.com/kevinhwang91/nvim-bqf).
 + Show search index and count with [nvim-hlslens](https://github.com/kevinhwang91/nvim-hlslens).
 + Command line auto-completion via [wilder.nvim](https://github.com/gelguy/wilder.nvim).

core/colorschemes.lua

@@ -105,12 +105,8 @@ M.rose_pine = function()
 end
 
 M.onedarkpro = function()
-  require("onedarkpro").setup({
-    dark_theme = "onedark", -- The default dark theme
-  })
-
   -- set colorscheme after options
-  vim.cmd('colorscheme onedarkpro')
+  vim.cmd('colorscheme onedark_vivid')
 end
 
 M.monokai = function()

core/globals.lua

@@ -5,7 +5,7 @@ local utils = require('utils')
 
 -- Inspect something
 function _G.inspect(item)
-  vim.pretty_print(item)
+  vim.print(item)
 end
 
 ------------------------------------------------------------------------

core/options.vim

@@ -3,10 +3,6 @@ scriptencoding utf-8
 " change fillchars for folding, vertical split, end of buffer, and message separator
 set fillchars=fold:\ ,vert:\│,eob:\ ,msgsep:‾
 
-" Paste mode toggle, it seems that Nvim's bracketed paste mode
-" does not work very well for nvim-qt, so we use good-old paste mode
-set pastetoggle=<F12>
-
 " Split window below/right when creating horizontal/vertical windows
 set splitbelow splitright
 
@@ -176,6 +172,7 @@ set diffopt+=filler  " show filler for deleted lines
 set diffopt+=closeoff  " turn off diff when one file window is closed
 set diffopt+=context:3  " context for diff
 set diffopt+=internal,indent-heuristic,algorithm:histogram
+set diffopt+=linematch:60
 
 set nowrap  " do no wrap
 set noruler

core/plugins.vim

@@ -137,31 +137,6 @@ let g:mundo_width = 80
 
 nnoremap <silent> <Space>u :MundoToggle<CR>
 
-""""""""""""""""""""""""""""vim-yoink settings"""""""""""""""""""""""""
-if g:is_win || g:is_mac
-  " ctrl-n and ctrl-p will not work if you add the TextChanged event to vim-auto-save events.
-  " nmap <c-n> <plug>(YoinkPostPasteSwapBack)
-  " nmap <c-p> <plug>(YoinkPostPasteSwapForward)
-
-  " The following p/P mappings are also needed for ctrl-n and ctrl-p to work
-  " nmap p <plug>(YoinkPaste_p)
-  " nmap P <plug>(YoinkPaste_P)
-
-  " Cycle the yank stack with the following mappings
-  nmap [y <plug>(YoinkRotateBack)
-  nmap ]y <plug>(YoinkRotateForward)
-
-  " Do not change the cursor position
-  nmap y <plug>(YoinkYankPreserveCursorPosition)
-  xmap y <plug>(YoinkYankPreserveCursorPosition)
-
-  " Move cursor to end of paste after multiline paste
-  let g:yoinkMoveCursorToEndOfPaste = 0
-
-  " Record yanks in system clipboard
-  let g:yoinkSyncSystemClipboardOnFocus = 1
-endif
-
 """"""""""""""""""""""""""""better-escape.vim settings"""""""""""""""""""""""""
 let g:better_escape_interval = 200
 

docs/nvim_setup_linux.sh

@@ -124,27 +124,27 @@ fi
 #######################################################################
 #                         lua-language-server                         #
 #######################################################################
-SUMNEKO_LUA_DIR=$HOME/tools/lua-language-server
-SUMNEKO_LUA_SRC_NAME=$HOME/packages/lua-language-server.tar.gz
-SUMNEKO_LUA_LINK="https://github.com/sumneko/lua-language-server/releases/download/3.5.3/lua-language-server-3.5.3-linux-x64.tar.gz"
+LUA_LS_DIR=$HOME/tools/lua-language-server
+LUA_LS_SRC=$HOME/packages/lua-language-server.tar.gz
+LUA_LS_LINK="https://github.com/LuaLS/lua-language-server/releases/download/3.6.11/lua-language-server-3.6.11-linux-x64.tar.gz"
 
-if [[ -z "$(command -v lua-language-server)" ]] && [[ ! -f "$SUMNEKO_LUA_DIR/bin/lua-language-server" ]]; then
+if [[ -z "$(command -v lua-language-server)" ]] && [[ ! -f "$LUA_LS_DIR/bin/lua-language-server" ]]; then
     echo 'Install lua-language-server'
-    if [[ ! -f $SUMNEKO_LUA_SRC_NAME ]]; then
+    if [[ ! -f $LUA_LS_SRC ]]; then
         echo "Downloading lua-language-server and renaming"
-        wget $SUMNEKO_LUA_LINK -O "$SUMNEKO_LUA_SRC_NAME"
+        wget $LUA_LS_LINK -O "$LUA_LS_SRC"
     fi
 
-    if [[ ! -d "$SUMNEKO_LUA_DIR" ]]; then
+    if [[ ! -d "$LUA_LS_DIR" ]]; then
         echo "Creating lua-language-server directory under tools directory"
-        mkdir -p "$SUMNEKO_LUA_DIR"
-        echo "Extracting to directory $SUMNEKO_LUA_DIR"
+        mkdir -p "$LUA_LS_DIR"
+        echo "Extracting to directory $LUA_LS_DIR"
 
-        tar zxvf "$SUMNEKO_LUA_SRC_NAME" -C "$SUMNEKO_LUA_DIR"
+        tar zxvf "$LUA_LS_SRC" -C "$LUA_LS_DIR"
     fi
 
     if [[ "$ADD_TO_SYSTEM_PATH" = true ]] && [[ "$USE_BASH_SHELL" = true ]]; then
-        echo "export PATH=\"$SUMNEKO_LUA_DIR/bin:\$PATH\"" >> "$HOME/.bash_profile"
+        echo "export PATH=\"$LUA_LS_DIR/bin:\$PATH\"" >> "$HOME/.bash_profile"
     fi
 else
     echo "lua-language-server is already installed. Skip installing it."

docs/nvim_setup_windows.ps1

@@ -36,19 +36,19 @@ scoop install vcredist2022
 scoop install 7zip
 
 # Install lua-language-server
-$sumneko_lua_link = "https://github.com/sumneko/lua-language-server/releases/download/3.5.3/lua-language-server-3.5.3-win32-x64.zip"
-$sumneko_lua_install_dir = "D:\portable_tools"
-$sumneko_lua_src_dir = "$sumneko_lua_install_dir\lua-language-server.zip"
-$sumneko_lua_dir = "$sumneko_lua_install_dir\lua-language-server"
+$lua_ls_link = "https://github.com/LuaLS/lua-language-server/releases/download/3.6.11/lua-language-server-3.6.11-win32-x64.zip"
+$lua_ls_install_dir = "D:\portable_tools"
+$lua_ls_src_path = "$lua_ls_install_dir\lua-language-server.zip"
+$lua_ls_dir = "$lua_ls_install_dir\lua-language-server"
 
 # Download file, ref: https://stackoverflow.com/a/51225744/6064933
-Invoke-WebRequest $sumneko_lua_link -OutFile "$sumneko_lua_src_dir"
+Invoke-WebRequest $lua_ls_link -OutFile "$lua_ls_src_path"
 
 # Extract the zip file using 7zip, ref: https://stackoverflow.com/a/41933215/6064933
-7z x "$sumneko_lua_src_dir" -o"$sumneko_lua_dir"
+7z x "$lua_ls_src_path" -o"$lua_ls_dir"
 
 # Setup PATH env variable, ref: https://stackoverflow.com/q/714877/6064933
-[Environment]::SetEnvironmentVariable("Path", $env:Path + ";$sumneko_lua_dir\bin", "Machine")
+[Environment]::SetEnvironmentVariable("Path", $env:Path + ";$lua_ls_dir\bin", "Machine")
 
 # Install neovim nightly
 scoop bucket add versions

init.lua

@@ -4,19 +4,23 @@
 -- I would not recommend cloning this repo and replace your own config. Good configurations are personal,
 -- built over time with a lot of polish.
 --
--- Author: Jie-dong Hao
+-- Author: Jiedong Hao
 -- Email: jdhao@hotmail.com
 -- Blog: https://jdhao.github.io/
+-- GitHub: https://github.com/jdhao
+-- StackOverflow: https://stackoverflow.com/users/6064933/jdhao
 
 local api = vim.api
-local utils = require("utils")
+local version = vim.version
 
 -- check if we have the latest stable version of nvim
-local expected_ver = "0.8.1"
-local nvim_ver = utils.get_nvim_version()
+local expected_ver = "0.9.0"
+local ev = version.parse(expected_ver)
+local actual_ver = version()
 
-if nvim_ver ~= expected_ver then
-  local msg = string.format("Unsupported nvim version: expect %s, but got %s instead!", expected_ver, nvim_ver)
+if version.cmp(ev, actual_ver) ~= 0 then
+  local _ver = string.format("%s.%s.%s", actual_ver.major, actual_ver.minor, actual_ver.patch)
+  local msg = string.format("Unsupported nvim version: expect %s, but got %s instead!", expected_ver, _ver)
   api.nvim_err_writeln(msg)
   return
 end

lua/config/lsp.lua

@@ -131,6 +131,20 @@ end
 --   vim.notify("pyright not found!", vim.log.levels.WARN, {title = 'Nvim-config'})
 -- end
 
+if utils.executable("ltex-ls") then
+  lspconfig.ltex.setup {
+    on_attach = custom_attach,
+    cmd = { "ltex-ls" },
+    filetypes = { "text", "plaintex", "tex", "markdown" },
+    settings = {
+      ltex = {
+        language = "en"
+      },
+    },
+    flags = { debounce_text_changes = 300 },
+}
+end
+
 if utils.executable("clangd") then
   lspconfig.clangd.setup {
     on_attach = custom_attach,
@@ -140,8 +154,6 @@ if utils.executable("clangd") then
       debounce_text_changes = 500,
     },
   }
-else
-  vim.notify("clangd not found!", vim.log.levels.WARN, { title = "Nvim-config" })
 end
 
 -- set up vim-language-server
@@ -166,8 +178,8 @@ if utils.executable("bash-language-server") then
 end
 
 if utils.executable("lua-language-server") then
-  -- settings for lua-language-server can be found on https://github.com/sumneko/lua-language-server/wiki/Settings .
-  lspconfig.sumneko_lua.setup {
+  -- settings for lua-language-server can be found on https://github.com/LuaLS/lua-language-server/wiki/Settings .
+  lspconfig.lua_ls.setup {
     on_attach = custom_attach,
     settings = {
       Lua = {
@@ -181,8 +193,8 @@ if utils.executable("lua-language-server") then
         },
         workspace = {
           -- Make the server aware of Neovim runtime files,
-          -- see also https://github.com/sumneko/lua-language-server/wiki/Libraries#link-to-workspace .
-          -- Lua-dev.nvim also has similar settings for sumneko lua, https://github.com/folke/lua-dev.nvim/blob/main/lua/lua-dev/sumneko.lua .
+          -- see also https://github.com/LuaLS/lua-language-server/wiki/Libraries#link-to-workspace .
+          -- Lua-dev.nvim also has similar settings for lua ls, https://github.com/folke/neodev.nvim/blob/main/lua/neodev/luals.lua .
           library = {
             fn.stdpath("data") .. "/site/pack/packer/opt/emmylua-nvim",
             fn.stdpath("config"),

lua/config/nvim-tree.lua

@@ -7,9 +7,6 @@ nvim_tree.setup {
   hijack_cursor = false,
   hijack_netrw = true,
   hijack_unnamed_buffer_when_opening = false,
-  ignore_buffer_on_setup = false,
-  open_on_setup = false,
-  open_on_setup_file = false,
   open_on_tab = false,
   sort_by = "name",
   update_cwd = false,
@@ -50,7 +47,6 @@ nvim_tree.setup {
     update_cwd = false,
     ignore_list = {},
   },
-  ignore_ft_on_setup = {},
   system_open = {
     cmd = "",
     args = {},
@@ -113,6 +109,7 @@ nvim_tree.setup {
   },
 }
 
-keymap.set("n", "<space>s", function()
-  return require("nvim-tree").toggle(false, true)
-end, { silent = true, desc = "toggle nvim-tree" })
+keymap.set("n", "<space>s", require("nvim-tree.api").tree.toggle, {
+  silent = true,
+  desc = "toggle nvim-tree",
+})

lua/config/statusline.lua

@@ -93,7 +93,7 @@ local diff = function()
   local add_num = git_status.added
 
   local info = { added = add_num, modified = modify_num, removed = remove_num }
-  -- vim.pretty_print(info)
+  -- vim.print(info)
   return info
 end
 

lua/config/yanky.lua

@@ -0,0 +1,13 @@
+require("yanky").setup({
+  ring = {
+    history_length = 50,
+    storage = "memory",
+  },
+  preserve_cursor_position = {
+    enabled = false,
+  },
+})
+
+-- cycle through the yank history, only work after paste
+vim.keymap.set("n", "[y", "<Plug>(YankyCycleForward)")
+vim.keymap.set("n", "]y", "<Plug>(YankyCycleBackward)")

lua/plugins.lua

@@ -137,7 +137,7 @@ packer.startup {
     use { "tanvirtin/monokai.nvim", opt = true }
     use { "marko-cerovac/material.nvim", opt = true }
 
-    use { "kyazdani42/nvim-web-devicons", event = "VimEnter" }
+    use { "nvim-tree/nvim-web-devicons", event = "VimEnter" }
 
     use {
       "nvim-lualine/lualine.nvim",
@@ -208,10 +208,14 @@ packer.startup {
     -- Show undo history visually
     use { "simnalamburt/vim-mundo", cmd = { "MundoToggle", "MundoShow" } }
 
+    -- better UI for some nvim actions
+    use {'stevearc/dressing.nvim'}
+
     -- Manage your yank history
-    if vim.g.is_win or vim.g.is_mac then
-      use { "svermeulen/vim-yoink", event = "VimEnter" }
-    end
+    use({
+      "gbprod/yanky.nvim",
+      config = [[require('config.yanky')]]
+    })
 
     -- Handy unix command inside Vim (Rename, Move etc.)
     use { "tpope/vim-eunuch", cmd = { "Rename", "Delete" } }
@@ -354,8 +358,8 @@ packer.startup {
 
     -- file explorer
     use {
-      "kyazdani42/nvim-tree.lua",
-      requires = { "kyazdani42/nvim-web-devicons" },
+      "nvim-tree/nvim-tree.lua",
+      requires = { "nvim-tree/nvim-web-devicons" },
       config = [[require('config.nvim-tree')]],
     }
 

lua/utils.lua

@@ -31,13 +31,6 @@ function M.may_create_dir(dir)
   end
 end
 
-function M.get_nvim_version()
-  local actual_ver = vim.version()
-
-  local nvim_ver_str = string.format("%d.%d.%d", actual_ver.major, actual_ver.minor, actual_ver.patch)
-  return nvim_ver_str
-end
-
 --- Generate random integers in the range [Low, High], inclusive,
 --- adapted from https://stackoverflow.com/a/12739441/6064933
 --- @low: the lower value for this range

plugin/abbrev.vim

@@ -1,2 +1,3 @@
 " some abbreviations
 iabbrev reqire require
+iabbrev serveral several

spell/en.utf-8.add

@@ -453,3 +453,8 @@ SQLite
 Pgadmin
 Datagrip
 mysql
+cwd
+pyright
+stubgen
+pylance
+variadic