Clean up

lua/plugins/init.lua

@@ -29,7 +29,6 @@ return {
 			require('lsp_signature').setup({})
 		end
 	},
-	'nvim-lua/lsp-status.nvim',
 	'kyazdani42/nvim-web-devicons',
 	'folke/trouble.nvim',
 	'folke/lsp-colors.nvim',
@@ -37,7 +36,6 @@ return {
 
 	'junegunn/vim-easy-align',
 	'machakann/vim-highlightedyank',
-	'vim-airline/vim-airline',
 	'lukas-reineke/indent-blankline.nvim',
 	'lambdalisue/suda.vim',
 	-- git
@@ -47,7 +45,13 @@ return {
 	'sjl/splice.vim',
 	'jamessan/vim-gnupg',
 
-	'lervag/vimtex',
+	{'lervag/vimtex',
+		init = function()
+			vim.g.tex_conceal="agm"
+			vim.g.vimtex_quickfix_ignorefilters = { 'overfull', 'underfull' }
+		end,
+		ft = "tex",
+	},
 	'ledger/vim-ledger',
 	'anekos/hledger-vim',
 

lua/plugins/lspconfig.lua

@@ -8,6 +8,7 @@ return {
       { "folke/neodev.nvim",  opts = {} },
       "mason.nvim",
       "williamboman/mason-lspconfig.nvim",
+      'nvim-lua/lsp-status.nvim',
       {
         "hrsh7th/cmp-nvim-lsp",
         cond = function()
@@ -16,7 +17,7 @@ return {
       },
     },
     ---@class PluginLspOpts
-    opts = {
+    opts = function() return {
       -- options for vim.diagnostic.config()
       diagnostics = {
         underline = true,
@@ -32,7 +33,7 @@ return {
         severity_sort = true,
       },
       -- add any global capabilities here
-      capabilities = {},
+      capabilities = { require'lsp-status'.capabilities },
       servers = {
         jsonls = {},
         lua_ls = {
@@ -71,7 +72,7 @@ return {
         -- Specify * to use this function as a fallback for any server
         -- ["*"] = function(server, opts) end,
       },
-    },
+    } end,
     ---@param opts PluginLspOpts
     config = function(_, opts)
       -- diagnostics
@@ -196,5 +197,11 @@ return {
     end,
   },
   'mfussenegger/nvim-jdtls',
+  {'nvim-lua/lsp-status.nvim',
+    config = function(_, opts)
+      local lsp_status = require('lsp-status')
+      lsp_status.register_progress()
+    end
+  }
 }
 

lua/plugins/tabline.lua

@@ -0,0 +1,74 @@
+local colors = {
+  blue = '#00afff',
+  lightblue = '#87afff',
+  orange = '#ffaf5f',
+  yellow = '#ffd75f',
+  green = '#87d75f',
+  red = '#ff0000',
+  lightred = '#ff5f5f',
+  white = '#ffffff',
+  lightgray = '#c6c6c6',
+  gray = '#6a6a6a',
+  bggray = '#1c1c1c',
+  lightbggray = '#262626',
+  visualgray = '#303030',
+  black = '#000000',
+  normfg = '#ffffff',
+  normbg = '#000000',
+}
+
+return {
+  'hoob3rt/lualine.nvim',
+  dependencies = {
+    {'kyazdani42/nvim-web-devicons', lazy = true },
+    'nvim-lua/lsp-status.nvim',
+  },
+  opts = {
+    options = {
+      theme = {
+        normal = {
+          a = { fg = colors.black, bg = colors.gray },
+          b = { fg = colors.yellow, bg = colors.lightbggray },
+          c = { fg = colors.blue, bg = colors.bggray },
+          z = { fg = colors.yellow, bg = colors.gray },
+        },
+        inactive = {
+          a = { fg = colors.black, bg = colors.gray },
+          b = { fg = colors.red, bg = colors.lightbggray },
+          c = { fg = colors.gray, bg = colors.bggray },
+          z = { fg = colors.blue, bg = colors.gray },
+        },
+        insert = { a = { fg = colors.black, bg = colors.green } },
+        visual = { a = { fg = colors.black, bg = colors.yellow } },
+        replace = { a = { fg = colors.black, bg = colors.red } },
+      }
+    },
+    tabline = {
+      lualine_a = { 'branch' },
+      lualine_b = {},
+      lualine_c = { 'windows' },
+      lualine_x = {},
+      lualine_y = {},
+      lualine_z = { 'tabs' }
+    },
+    sections = {
+      lualine_a = { 'filename' },
+      lualine_b = { 'diff', 'diagnostics' },
+      lualine_c = {},
+      lualine_x = { "require'lsp-status'.status()" },
+      lualine_y = { 'filetype' },
+      lualine_z = { 'searchcount', 'location' }
+    },
+    inactive_sections = {
+      lualine_a = {},
+      lualine_b = {},
+      lualine_c = { 'filename' },
+      lualine_x = { 'location' },
+      lualine_y = {},
+      lualine_z = {}
+    },
+    winbar = {},
+    inactive_winbar = {},
+    extensions = {}
+  }
+}

lua/plugins/treesitter.lua

@@ -28,7 +28,7 @@ return {
     },
     keys = {
       { "<c-space>", desc = "Increment selection" },
-      { "<bs>", desc = "Decrement selection", mode = "x" },
+      { "<bs>",      desc = "Decrement selection", mode = "x" },
     },
     ---@type TSConfig
     opts = {
@@ -76,13 +76,28 @@ return {
           end
           added[lang] = true
           return true
-        end, opts.ensure_installed)
+        end, opts.ensure_installed --[[@as string[] ]])
       end
       require("nvim-treesitter.configs").setup(opts)
     end,
   },
   { 'nvim-treesitter/playground',
+    dependencies = { "nvim-treesitter/nvim-treesitter" },
     cmd = 'TSPlaygroundToggle'
   },
+  { "nvim-treesitter/nvim-treesitter-context",
+    event = "VeryLazy",
+    dependencies = { "nvim-treesitter/nvim-treesitter" },
+    cmd = { 'TSContextEnable', 'TSContextDisable', 'TSContextToggle' },
+    keys = {
+      { "[c", function() require("treesitter-context").go_to_context() end, desc = "Go to context start" },
+    },
+    opts = { enable = true },
+    config = function(_, opts)
+      require'treesitter-context'.setup(opts)
+      vim.api.nvim_set_hl(0, 'TreesitterContext', { bg = "#555555" })
+      vim.api.nvim_set_hl(0, 'TreesitterContextLineNumber', { link = "Special" })
+    end,
+  }
 
 }