Merge remote-tracking branch 'origin/nb' into athos

lua/plugins/cmp.lua

@@ -17,16 +17,9 @@ return {
       vim.opt.completeopt = { 'menu', 'menuone', 'noselect' }
       vim.opt.shortmess:append 'c'
 
-      local lspkind = require 'lspkind'
-      lspkind.init {
-        symbol_map = {
-          Copilot = '',
-        },
-        mode = 'symbol',
-      }
-      vim.api.nvim_set_hl(0, 'CmpItemKindCopilot', { fg = '#6CC644' })
-
       local cmp = require 'cmp'
+      local lspkind = require 'lspkind'
+      lspkind.init()
 
       cmp.setup {
         sources = {
@@ -54,6 +47,23 @@ return {
             require('luasnip').lsp_expand(args.body)
           end,
         },
+
+        formatting = {
+          expandable_indicator = true,
+          fields = { 'abbr', 'kind' },
+          format = lspkind.cmp_format {
+            mode = 'symbol', -- show only symbol annotations
+            maxwidth = 20, -- prevent the popup from showing more than provided characters (e.g 50 will not show more than 50 characters)
+            ellipsis_char = '...', -- when popup menu exceed maxwidth, the truncated part would show ellipsis_char instead (must define maxwidth first)
+            show_labelDetails = true, -- show labelDetails in menu. Disabled by default
+
+            -- The function below will be called before any actual modifications from lspkind
+            -- so that you can provide more controls on popup customization. (See [#30](https://github.com/onsails/lspkind-nvim/pull/30))
+            -- before = function(entry, vim_item)
+            --   return vim_item
+            -- end,
+          },
+        },
       }
 
       -- Setup up vim-dadbod

lua/plugins/lsp.lua

@@ -99,6 +99,7 @@ return {
         'lua_ls',
         'eslint_d',
         'prettier',
+        'ts_ls',
       }
 
       vim.list_extend(ensure_installed, servers_to_install)
@@ -190,6 +191,15 @@ return {
       })
     end,
   },
+  {
+    'onsails/lspkind-nvim',
+    opts = {
+      -- defines how annotations are shown
+      -- default: symbol
+      -- options: 'text', 'text_symbol', 'symbol_text', 'symbol'
+      mode = 'symbol_text',
+    },
+  },
   {
     'hedyhli/outline.nvim',
     lazy = true,
@@ -198,7 +208,7 @@ return {
       { '<leader>co', '<cmd>Outline<CR>', desc = 'Toggle outline' },
     },
     opts = {
-      -- Your setup opts here
+      symbols = { icon_source = 'lspkind' },
     },
   },
 }

lua/plugins/noice.lua

@@ -23,6 +23,14 @@ return {
       lsp_doc_border = true, -- add a border to hover docs and signature help
     },
   },
+  keys = {
+    { '<leader>md', '<cmd>Noice dismiss<CR>', mode = 'n', desc = 'Noice dismiss' },
+  },
+  init = function()
+    vim.keymap.set('c', '<S-Enter>', function()
+      require('noice').redirect(vim.fn.getcmdline())
+    end, { desc = 'Redirect Cmdline' })
+  end,
   dependencies = {
     'MunifTanjim/nui.nvim',
     'rcarriga/nvim-notify',

lua/plugins/oil.lua

@@ -2,19 +2,18 @@ return {
   {
     'stevearc/oil.nvim',
     dependencies = { 'nvim-tree/nvim-web-devicons' },
-    config = function()
-      require('oil').setup {
-        columns = { 'icon' },
-        keymaps = {
-          ['<C-h>'] = false,
-          ['<M-h>'] = 'actions.select_split',
-          ['q'] = 'actions.close',
-        },
-        view_options = {
-          show_hidden = true,
-        },
-      }
-
+    opts = {
+      columns = { 'icon' },
+      keymaps = {
+        ['<C-h>'] = false,
+        ['<M-h>'] = 'actions.select_split',
+        ['q'] = 'actions.close',
+      },
+      view_options = {
+        show_hidden = true,
+      },
+    },
+    init = function()
       -- Open parent directory in current window
       vim.keymap.set('n', '-', '<CMD>Oil<CR>', { desc = 'Open parent directory' })