Update lots of things

lua/my-lsp.lua

@@ -48,8 +48,6 @@ local on_attach = function(client, bufnr)
   vim.cmd [[autocmd BufEnter,BufWrite <buffer> lua vim.lsp.codelens.refresh()]]
   vim.cmd [[autocmd CursorHoldI * silent! lua vim.lsp.buf.signature_help()]]
   vim.cmd [[autocmd CursorHold * lua vim.diagnostic.open_float({max_width = 100, focusable = false})]]
-
-  vim.lsp.codelens.refresh()
 end
 
 require("lsp.installer")(on_attach)

lua/plugins/beamer.lua

@@ -0,0 +1,7 @@
+return {
+  'uloco/bluloco.nvim',
+  dependencies = { 'rktjmp/lush.nvim' },
+  opts = {
+    italics = true,
+  },
+}

lua/plugins/chroma.lua

@@ -1,5 +1,8 @@
 return {
+  --'crater2150/vim-theme-chroma-lush',
   'crater2150/vim-theme-chroma',
-  lazy = false, priority = 1000,
+  dev = true,
+  lazy = false,
+  priority = 1000,
   config = function() vim.cmd.colorscheme("chroma") end
 }

lua/plugins/cmp.lua

@@ -9,7 +9,6 @@ return {
       "hrsh7th/cmp-nvim-lsp",
       "hrsh7th/cmp-buffer",
       'hrsh7th/cmp-buffer',
-      'hrsh7th/cmp-nvim-lsp',
       'hrsh7th/cmp-path',
       'hrsh7th/cmp-cmdline',
       'hrsh7th/cmp-vsnip',
@@ -29,7 +28,7 @@ return {
                 text = false,
               }
             }
-          }
+          },
         },
         config = function ()
           require("copilot_cmp").setup()

lua/plugins/fugitive.lua

@@ -0,0 +1,3 @@
+return {
+  'tpope/vim-fugitive'
+}

lua/plugins/init.lua

@@ -17,7 +17,7 @@ return {
 	},
 	-- ii / ai
 	'michaeljsmith/vim-indent-object',
-	'airblade/vim-gitgutter',
+	{'lewis6991/gitsigns.nvim', config=true},
 
 	'neovim/nvim-lspconfig',
 

lua/plugins/lspconfig.lua

@@ -9,12 +9,7 @@ return {
       "mason.nvim",
       "williamboman/mason-lspconfig.nvim",
       'nvim-lua/lsp-status.nvim',
-      {
-        "hrsh7th/cmp-nvim-lsp",
-        cond = function()
-          return require("lazy.core.config").plugins["nvim-cmp"] ~= nil
-        end,
-      },
+      "hrsh7th/cmp-nvim-lsp",
     },
     ---@class PluginLspOpts
     opts = function() return {
@@ -162,6 +157,7 @@ return {
           nls.builtins.completion.vsnip,
           nls.builtins.diagnostics.zsh,
           nls.builtins.formatting.beautysh,
+          nls.builtins.code_actions.gitsigns,
         },
       }
     end,

lua/plugins/lush.lua

@@ -0,0 +1,4 @@
+return {
+	'rktjmp/lush.nvim',
+  'rktjmp/shipwright.nvim',
+}

lua/plugins/metals.lua

@@ -5,6 +5,7 @@ return {
     'mfussenegger/nvim-dap',
     "hrsh7th/cmp-nvim-lsp",
   },
+  ft = { 'scala', 'sbt' },
   config = function()
     local metals_config = require('metals').bare_config()
     metals_config.init_options.statusBarProvider = "on"

lua/plugins/tabline.lua

@@ -1,47 +1,14 @@
-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',
+  'nvim-lualine/lualine.nvim',
   dependencies = {
     {'kyazdani42/nvim-web-devicons', lazy = true },
     'nvim-lua/lsp-status.nvim',
+    'crater2150/vim-theme-chroma',
   },
-  opts = {
+  event = "VeryLazy",
+  opts = function(_, opts) return {
     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 } },
-      }
+      theme = require('chroma-theme.lualine')
     },
     tabline = {
       lualine_a = { 'branch' },
@@ -54,7 +21,6 @@ return {
     sections = {
       lualine_a = { 'filename' },
       lualine_b = { 'diff', 'diagnostics' },
-      lualine_c = {},
       lualine_x = { "require'lsp-status'.status()" },
       lualine_y = { 'filetype' },
       lualine_z = { 'searchcount', 'location' }
@@ -71,4 +37,5 @@ return {
     inactive_winbar = {},
     extensions = {}
   }
+  end,
 }

lua/plugins/treesitter.lua

@@ -83,7 +83,11 @@ return {
   },
   { 'nvim-treesitter/playground',
     dependencies = { "nvim-treesitter/nvim-treesitter" },
-    cmd = 'TSPlaygroundToggle'
+    cmd = {
+      'TSPlaygroundToggle',
+      'TSHighlightCapturesUnderCursor',
+      'TSNodeUnderCursor',
+    }
   },
   { "nvim-treesitter/nvim-treesitter-context",
     event = "VeryLazy",