fix: conf is not local

Specify the correct python executable path for mypy to work well.

README.md

@@ -13,7 +13,7 @@
       <img alt="Latest release" src="https://img.shields.io/github/v/release/jdhao/nvim-config" />
     </a>
     <a href="https://github.com/neovim/neovim/releases/tag/stable">
-      <img src="https://img.shields.io/badge/Neovim-0.8.1-blueviolet.svg?style=flat-square&logo=Neovim&logoColor=green" alt="Neovim minimum version"/>
+      <img src="https://img.shields.io/badge/Neovim-0.9.1-blueviolet.svg?style=flat-square&logo=Neovim&logoColor=green" alt="Neovim minimum version"/>
     </a>
     <a href="https://github.com/jdhao/nvim-config/search?l=vim-script">
       <img src="https://img.shields.io/github/languages/top/jdhao/nvim-config" alt="Top languages"/>
@@ -21,8 +21,8 @@
     <a href="https://github.com/jdhao/nvim-config/graphs/commit-activity">
       <img src="https://img.shields.io/github/commit-activity/m/jdhao/nvim-config?style=flat-square" />
     </a>
-    <a href="https://github.com/jdhao/nvim-config/releases/tag/v0.8.1">
-      <img src="https://img.shields.io/github/commits-since/jdhao/nvim-config/v0.8.1?style=flat-square" />
+    <a href="https://github.com/jdhao/nvim-config/releases/tag/v0.9.1">
+      <img src="https://img.shields.io/github/commits-since/jdhao/nvim-config/v0.9.1?style=flat-square" />
     </a>
     <a href="https://github.com/jdhao/nvim-config/graphs/contributors">
       <img src="https://img.shields.io/github/contributors/jdhao/nvim-config?style=flat-square" />

after/ftplugin/json.vim

@@ -0,0 +1,6 @@
+" let the initial folding state be that all folds are closed.
+set foldlevel=0
+
+" Use nvim-treesitter for folding
+set foldmethod=expr
+set foldexpr=nvim_treesitter#foldexpr()

core/plugins.vim

@@ -109,6 +109,20 @@ let g:Lf_PopupColorscheme = 'gruvbox_material'
 " items.
 let g:Lf_CommandMap = {'<C-J>': ['<C-N>'], '<C-K>': ['<C-P>']}
 
+" do not preview results, it will add the file to buffer list
+let g:Lf_PreviewResult = {
+      \ 'File': 0,
+      \ 'Buffer': 0,
+      \ 'Mru': 0,
+      \ 'Tag': 0,
+      \ 'BufTag': 1,
+      \ 'Function': 1,
+      \ 'Line': 0,
+      \ 'Colorscheme': 0,
+      \ 'Rg': 0,
+      \ 'Gtags': 0
+      \}
+
 """"""""""""""""""""""""""""open-browser.vim settings"""""""""""""""""""
 if g:is_win || g:is_mac
   " Disable netrw's gx mapping.

init.lua

@@ -9,12 +9,13 @@
 -- Blog: https://jdhao.github.io/
 -- GitHub: https://github.com/jdhao
 -- StackOverflow: https://stackoverflow.com/users/6064933/jdhao
+vim.loader.enable()
 
 local api = vim.api
 local version = vim.version
 
 -- check if we have the latest stable version of nvim
-local expected_ver = "0.9.0"
+local expected_ver = "0.9.1"
 local ev = version.parse(expected_ver)
 local actual_ver = version()
 

lua/config/bufferline.lua

@@ -9,7 +9,7 @@ require("bufferline").setup {
       icon = "▎", -- this should be omitted if indicator style is not 'icon'
       style = "icon",
     },
-    buffer_close_icon = "",
+    buffer_close_icon = "",
     modified_icon = "●",
     close_icon = "",
     left_trunc_marker = "",

lua/config/dashboard-nvim.lua

@@ -2,7 +2,8 @@ local api = vim.api
 local keymap = vim.keymap
 local dashboard = require("dashboard")
 
-dashboard.custom_header = {
+local conf = {}
+conf.header = {
   "                                                       ",
   "                                                       ",
   "                                                       ",
@@ -18,46 +19,52 @@ dashboard.custom_header = {
   "                                                       ",
 }
 
-dashboard.custom_center = {
+conf.center = {
   {
-    icon = "  ",
+    icon = "󰈞  ",
     desc = "Find  File                              ",
     action = "Leaderf file --popup",
-    shortcut = "<Leader> f f",
+    key = "<Leader> f f",
   },
   {
-    icon = "  ",
+    icon = "󰈢  ",
     desc = "Recently opened files                   ",
     action = "Leaderf mru --popup",
-    shortcut = "<Leader> f r",
+    key = "<Leader> f r",
   },
   {
-    icon = "  ",
+    icon = "󰈬  ",
     desc = "Project grep                            ",
     action = "Leaderf rg --popup",
-    shortcut = "<Leader> f g",
+    key = "<Leader> f g",
   },
   {
-    icon = "  ",
+    icon = "  ",
     desc = "Open Nvim config                        ",
     action = "tabnew $MYVIMRC | tcd %:p:h",
-    shortcut = "<Leader> e v",
+    key = "<Leader> e v",
   },
   {
     icon = "  ",
     desc = "New file                                ",
     action = "enew",
-    shortcut = "e           ",
+    key = "e",
   },
   {
-    icon = "  ",
+    icon = "󰗼  ",
     desc = "Quit Nvim                               ",
     -- desc = "Quit Nvim                               ",
     action = "qa",
-    shortcut = "q           ",
+    key = "q",
   },
 }
 
+dashboard.setup({
+  theme = 'doom',
+  shortcut_type = 'number',
+  config = conf
+})
+
 api.nvim_create_autocmd("FileType", {
   pattern = "dashboard",
   group = api.nvim_create_augroup("dashboard_enter", { clear = true }),

lua/config/lsp.lua

@@ -6,6 +6,18 @@ local diagnostic = vim.diagnostic
 
 local utils = require("utils")
 
+-- set quickfix list from diagnostics in a certain buffer, not the whole workspace
+local set_qflist = function(buf_num, severity)
+  local diagnostics = nil
+  diagnostics = diagnostic.get(buf_num, { severity = severity })
+
+  local qf_items = diagnostic.toqflist(diagnostics)
+  vim.fn.setqflist({}, ' ', { title = 'Diagnostics', items = qf_items })
+
+  -- open quickfix by default
+  vim.cmd[[copen]]
+end
+
 local custom_attach = function(client, bufnr)
   -- Mappings.
   local map = function(mode, l, r, opts)
@@ -23,7 +35,10 @@ local custom_attach = function(client, bufnr)
   map("n", "gr", vim.lsp.buf.references, { desc = "show references" })
   map("n", "[d", diagnostic.goto_prev, { desc = "previous diagnostic" })
   map("n", "]d", diagnostic.goto_next, { desc = "next diagnostic" })
-  map("n", "<space>q", diagnostic.setqflist, { desc = "put diagnostic to qf" })
+  -- this puts diagnostics from opened files to quickfix
+  map("n", "<space>qw", diagnostic.setqflist, { desc = "put window diagnostics to qf" })
+  -- this puts diagnostics from current buffer to quickfix
+  map("n", "<space>qb", function() set_qflist(bufnr) end, { desc = "put buffer diagnostics to qf" })
   map("n", "<space>ca", vim.lsp.buf.code_action, { desc = "LSP code action" })
   map("n", "<space>wa", vim.lsp.buf.add_workspace_folder, { desc = "add workspace folder" })
   map("n", "<space>wr", vim.lsp.buf.remove_workspace_folder, { desc = "remove workspace folder" })
@@ -99,17 +114,40 @@ local capabilities = require('cmp_nvim_lsp').default_capabilities()
 local lspconfig = require("lspconfig")
 
 if utils.executable("pylsp") then
+  local venv_path = os.getenv('VIRTUAL_ENV')
+  local py_path = nil
+  -- decide which python executable to use for mypy
+  if venv_path ~= nil then
+    py_path = venv_path .. "/bin/python3"
+  else
+    py_path = vim.g.python3_host_prog
+  end
+
   lspconfig.pylsp.setup {
     on_attach = custom_attach,
     settings = {
       pylsp = {
         plugins = {
+          -- formatter options
+          black = { enabled = true },
+          autopep8 = { enabled = false },
+          yapf = { enabled = false },
+          -- linter options
           pylint = { enabled = true, executable = "pylint" },
+          ruff = { enabled = false },
           pyflakes = { enabled = false },
           pycodestyle = { enabled = false },
+          -- type checker
+          pylsp_mypy = {
+            enabled = true,
+            overrides = { "--python-executable", py_path, true },
+            report_progress = true,
+            live_mode = false
+          },
+          -- auto-completion options
           jedi_completion = { fuzzy = true },
-          pyls_isort = { enabled = true },
-          pylsp_mypy = { enabled = true },
+          -- import sorting
+          isort = { enabled = true },
         },
       },
     },
@@ -209,10 +247,10 @@ if utils.executable("lua-language-server") then
 end
 
 -- Change diagnostic signs.
-fn.sign_define("DiagnosticSignError", { text = "✗", texthl = "DiagnosticSignError" })
-fn.sign_define("DiagnosticSignWarn", { text = "!", texthl = "DiagnosticSignWarn" })
-fn.sign_define("DiagnosticSignInformation", { text = "", texthl = "DiagnosticSignInfo" })
-fn.sign_define("DiagnosticSignHint", { text = "", texthl = "DiagnosticSignHint" })
+fn.sign_define("DiagnosticSignError", { text = '🆇', texthl = "DiagnosticSignError" })
+fn.sign_define("DiagnosticSignWarn", { text = '⚠️', texthl = "DiagnosticSignWarn" })
+fn.sign_define("DiagnosticSignInfo", { text = 'ℹ️', texthl = "DiagnosticSignInfo" })
+fn.sign_define("DiagnosticSignHint", { text = '', texthl = "DiagnosticSignHint" })
 
 -- global config for diagnostic
 diagnostic.config {

lua/config/statusline.lua

@@ -127,6 +127,11 @@ require("lualine").setup {
         spell,
         color = { fg = "black", bg = "#a7c080" },
       },
+      {
+        "diagnostics",
+        sources = { "nvim_diagnostic" },
+        symbols = {error = '🆇 ', warn = '⚠️ ', info = 'ℹ️ ', hint = ' '},
+      },
     },
     lualine_x = {
       "encoding",
@@ -140,13 +145,11 @@ require("lualine").setup {
       },
       "filetype",
     },
-    lualine_y = { "progress" },
-    lualine_z = {
+    lualine_y = {
       "location",
-      {
-        "diagnostics",
-        sources = { "nvim_diagnostic" },
+      "progress",
     },
+    lualine_z = {
       {
         trailing_space,
         color = "WarningMsg",

lua/config/treesitter.lua

@@ -1,5 +1,5 @@
 require("nvim-treesitter.configs").setup {
-  ensure_installed = { "python", "cpp", "lua", "vim" },
+  ensure_installed = { "python", "cpp", "lua", "vim", "json", "toml" },
   ignore_install = {}, -- List of parsers to ignore installing
   highlight = {
     enable = true, -- false will disable the whole extension

lua/plugins.lua

@@ -43,9 +43,6 @@ end
 
 packer.startup {
   function(use)
-    -- it is recommended to put impatient.nvim before any other plugins
-    use { "lewis6991/impatient.nvim", config = [[require('impatient')]] }
-
     use { "wbthomason/packer.nvim", opt = true }
 
     use { "onsails/lspkind-nvim", event = "VimEnter" }
@@ -151,7 +148,7 @@ packer.startup {
       config = [[require('config.bufferline')]] }
 
     -- fancy start screen
-    use { "glepnir/dashboard-nvim", event = "VimEnter",
+    use { "nvimdev/dashboard-nvim", event = "VimEnter",
       cond = firenvim_not_active,
       config = [[require('config.dashboard-nvim')]]
     }
@@ -365,7 +362,7 @@ packer.startup {
 
     use { "ii14/emmylua-nvim", ft = "lua" }
 
-    use { "j-hui/fidget.nvim", after = "nvim-lspconfig", config = [[require('config.fidget-nvim')]] }
+    use { "j-hui/fidget.nvim", after = "nvim-lspconfig", tag = "legacy", config = [[require('config.fidget-nvim')]] }
   end,
   config = {
     max_jobs = 16,

plugin/command.vim

@@ -45,3 +45,6 @@ function! s:md_to_pdf() abort
     echoerr "Error running command"
   endif
 endfunction
+
+" json format
+command! -range JSONFormat <line1>,<line2>!python -m json.tool