Merge remote-tracking branch 'origin/master'

.vim/lua/lualine_setup.lua

@@ -0,0 +1,25 @@
+require('lsp-progress').setup({
+
+})
+
+local config = {
+  sections = {
+    lualine_c = {
+      'filename',
+      function()
+        return require('lsp-progress').progress()
+      end,
+    }
+  }
+}
+
+--local function ins_left(component)
+--table.insert(config.sections.lualine_c, component)
+--end
+
+--ins_left({
+--'lsp_progress',
+--display_components = { 'lsp_client_name', { 'percentage' } }
+--})
+
+require('lualine').setup(config)

.vim/nvim.lua

@@ -106,9 +106,11 @@ local function pyright_custom_diagnostic(a, params, client_id, c, config)
   vim.lsp.diagnostic.on_publish_diagnostics(a, params, client_id, c, config)
 end
 
-nvim_lsp.pyright.setup({ on_attach = function(client, bufnr)
+nvim_lsp.pyright.setup({
-  vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(pyright_custom_diagnostic, diagnostic_options)
+  on_attach = function(client, bufnr)
-end })
+    vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(pyright_custom_diagnostic, diagnostic_options)
+  end
+})
 --nvim_lsp.pyright.setup({ on_attach = on_attach })
 --nvim_lsp.pylsp.setup({
 --on_attach = on_attach,
@@ -387,17 +389,17 @@ require('trouble').setup {
     jump = { "o", "<tab>" }, -- jump to the diagnostic or open / close folds
     --open_split = { "<c-x>" }, -- open buffer in new split
     --open_vsplit = { "<c-v>" }, -- open buffer in new vsplit
-    open_tab = {}, -- open buffer in new tab
+    open_tab = {},                -- open buffer in new tab
-    jump_close = { "<cr>" }, -- jump to the diagnostic and close the list
+    jump_close = { "<cr>" },      -- jump to the diagnostic and close the list
-    toggle_mode = "m", -- toggle between "workspace" and "document" diagnostics mode
+    toggle_mode = "m",            -- toggle between "workspace" and "document" diagnostics mode
-    toggle_preview = "P", -- toggle auto_preview
+    toggle_preview = "P",         -- toggle auto_preview
-    hover = "K", -- opens a small popup with the full multiline message
+    hover = "K",                  -- opens a small popup with the full multiline message
-    preview = "p", -- preview the diagnostic location
+    preview = "p",                -- preview the diagnostic location
     close_folds = { "zM", "zm" }, -- close all folds
-    open_folds = { "zR", "zr" }, -- open all folds
+    open_folds = { "zR", "zr" },  -- open all folds
     toggle_fold = { "zA", "za" }, -- toggle fold of current file
-    previous = "k", -- previous item
+    previous = "k",               -- previous item
-    next = "j" -- next item
+    next = "j"                    -- next item
   },
 }
 
@@ -510,9 +512,9 @@ require 'nvim-treesitter.configs'.setup {
     "python",
     "query",
     "rust",
-    "svelte",
     "terraform",
     "toml",
+    "tsx",
     "typescript",
     "vim",
     "yaml",
@@ -549,7 +551,7 @@ require 'nvim-treesitter.configs'.setup {
   playground = {
     enable = true,
     disable = {},
-    updatetime = 25, -- Debounced time for highlighting nodes in the playground from source code
+    updatetime = 25,         -- Debounced time for highlighting nodes in the playground from source code
     persist_queries = false, -- Whether the query persists across vim sessions
     keybindings = {
       toggle_query_editor = 'o',
@@ -668,3 +670,4 @@ end
 
 require("murdock")
 require("lir_setup")
+require("lualine_setup")

.vimrc

@@ -143,8 +143,10 @@ Plug 'sjbach/lusty'
 "Plug 'w0rp/ale'
 "Plug 'airblade/vim-gitgutter'
 Plug 'mhinz/vim-signify'
-Plug 'vim-airline/vim-airline'
+"Plug 'vim-airline/vim-airline'
-Plug 'vim-airline/vim-airline-themes'
+"Plug 'vim-airline/vim-airline-themes'
+Plug 'nvim-lualine/lualine.nvim'
+Plug 'linrongbin16/lsp-progress.nvim'
 "Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
 "Plug 'junegunn/fzf.vim'
 Plug 'airblade/vim-rooter'

.yarnrc

@@ -2,5 +2,5 @@
 # yarn lockfile v1
 
 
-lastUpdateCheck 1664156115452
+lastUpdateCheck 1711242871592
 prefix "/home/barak/.yarn"