add eyeliner, trouble

nix/neovim-overlay.nix

@@ -23,6 +23,7 @@ with final.pkgs.lib; let
     cmp-treesitter
     cmp_luasnip
     diffview-nvim
+    eyeliner-nvim
     friendly-snippets
     gitsigns-nvim
     lualine-nvim
@@ -68,6 +69,7 @@ with final.pkgs.lib; let
     telescope-fzf-native-nvim
     telescope-nvim
     toggleterm-nvim
+    trouble-nvim
     undotree
     which-key-nvim
   ];

nvim/after/plugin/color.lua

@@ -1,2 +1,4 @@
 vim.cmd('colorscheme terafox')
 vim.keymap.set('n', '<leader>aa', '<cmd>AerialToggle!<CR>', { desc = 'Toggle Aerial' })
+vim.keymap.set('n', '<leader>nb', vim.cmd.DiffviewOpen, { noremap = true, desc = '[g]it [d]iffview open' })
+vim.keymap.set('n', '<leader>t', "<cmd>Trouble diagnostics toggle focus=true filter.buf=0<CR>", { noremap = true, desc = 'Trouble diagnostics' })

nvim/init.lua

@@ -73,12 +73,3 @@ vim.diagnostic.config {
     prefix = '',
   },
 }
-
-vim.keymap.set('n', '<space>ee', function()
-  local _, winid = vim.diagnostic.open_float(nil, { scope = 'line' })
-  if not winid then
-    vim.notify('no diagnostics found', vim.log.levels.INFO)
-    return
-  end
-  vim.api.nvim_win_set_config(winid or 0, { focusable = true })
-end, { noremap = true, silent = true, desc = 'diagnostics floating window' })

nvim/plugin/diffview.lua

@@ -1,7 +0,0 @@
-if vim.g.did_load_diffview_plugin then
-  return
-end
-vim.g.did_load_diffview_plugin = true
-
-require('diffview').setup { use_icons = false }
-vim.keymap.set('n', '<leader>gdd', vim.cmd.DiffviewOpen, { desc = '[g]it [d]iffview open' })

nvim/plugin/git.lua

@@ -1,7 +0,0 @@
-if vim.g.did_load_diffview_plugin then
-  return
-end
-vim.g.did_load_diffview_plugin = true
-require('diffview').setup {
-  use_icons = false,
-}

nvim/plugin/gitsigns.lua

@@ -3,7 +3,6 @@ if vim.g.did_load_gitsigns_plugin then
 end
 vim.g.did_load_gitsigns_plugin = true
 
-vim.schedule(function()
 require('gitsigns').setup {
   signcolumn = false,
   numhl = true,
@@ -39,4 +38,3 @@ vim.schedule(function()
     end, { expr = true })
   end,
 }
-end)

nvim/plugin/keymaps.lua

@@ -8,6 +8,6 @@ vim.keymap.set('n', '<C-b>', '<C-b>zz')
 vim.keymap.set('n', '<CR>', 'm0i<cr><Esc>`0', { noremap = true, silent = true })
 vim.keymap.set({ 'v', 'i' }, 'wq', '<esc>l', { noremap = true, silent = true })
 vim.keymap.set({ 'n', 'v', 'i' }, 'qwq', '<esc>l<cmd>wqa<CR>', { noremap = true, silent = true })
-vim.keymap.set({ 'n', 'v' }, '<leader>yy', '"+y', { noremap = true, silent = true, desc = 'Yank to clip' })
+vim.keymap.set({ 'n', 'v' }, '<leader>yy', '"*y', { noremap = true, silent = true, desc = 'Yank to clip' })
-vim.keymap.set({ 'n', 'v' }, '<leader>yp', '"+p', { noremap = true, silent = true, desc = 'Paste from clip' })
+vim.keymap.set({ 'n', 'v' }, '<leader>yp', '"*p', { noremap = true, silent = true, desc = 'Paste from clip' })
-vim.keymap.set({ 'n', 'v' }, '<leader>yd', '"+d', { noremap = true, silent = true, desc = 'Delete to clip' })
+vim.keymap.set({ 'n', 'v' }, '<leader>yd', '"*d', { noremap = true, silent = true, desc = 'Delete to clip' })

nvim/plugin/lsp.lua

@@ -16,9 +16,9 @@ lspconfig.gopls.setup {
 lspconfig.pyright.setup { capabilities = capabilities }
 lspconfig.nil_ls.setup { capabilities = capabilities }
 
-vim.keymap.set('n', '<leader>de', vim.diagnostic.open_float, { desc = 'Toggle diagnostic' })
 vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, { desc = 'Prev diagnostic' })
 vim.keymap.set('n', ']d', vim.diagnostic.goto_next, { desc = 'Next diagnostic' })
+vim.keymap.set('n', '<leader>de', vim.diagnostic.open_float, { desc = 'Toggle diagnostic' })
 
 vim.diagnostic.config {
   virtual_text = true,

nvim/plugin/mini.lua

@@ -53,8 +53,6 @@ require('mini.splitjoin').setup {
 require('mini.pairs').setup()
 vim.cmd([[ hi MiniCursorwordCurrent ctermfg=240 ]])
 
--- f F t T
-require('mini.jump').setup()
 require('mini.jump2d').setup {
   mappings = { start_jumping = '<leader>s' },
 }

nvim/plugin/misc.lua

@@ -18,3 +18,5 @@ require('toggleterm').setup {
 require('which-key').setup {
   preset = 'helix',
 }
+require('trouble').setup {}
+require('eyeliner').setup {}

nvim/plugin/statuscol.lua

@@ -1,7 +0,0 @@
-if vim.g.did_load_diffview_plugin then
-  return
-end
-vim.g.did_load_diffview_plugin = true
-require('diffview').setup {
-  use_icons = false,
-}

nvim/plugin/treesitter.lua

@@ -63,4 +63,5 @@ require('nvim-treesitter.configs').setup {
 
 require('treesitter-context').setup {
   max_lines = 3,
+  min_window_height = 50
 }