diff --git a/nix/neovim-overlay.nix b/nix/neovim-overlay.nix
index 27095b0..99a98c7 100644
--- a/nix/neovim-overlay.nix
+++ b/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
   ];
diff --git a/nvim/after/plugin/color.lua b/nvim/after/plugin/color.lua
index 18f2d6b..68bb744 100644
--- a/nvim/after/plugin/color.lua
+++ b/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' })
diff --git a/nvim/init.lua b/nvim/init.lua
index 7ff6dec..e748f34 100644
--- a/nvim/init.lua
+++ b/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' })
diff --git a/nvim/plugin/diffview.lua b/nvim/plugin/diffview.lua
deleted file mode 100644
index 01592e7..0000000
--- a/nvim/plugin/diffview.lua
+++ /dev/null
@@ -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' })
diff --git a/nvim/plugin/git.lua b/nvim/plugin/git.lua
deleted file mode 100644
index 1cc61f1..0000000
--- a/nvim/plugin/git.lua
+++ /dev/null
@@ -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,
-}
diff --git a/nvim/plugin/gitsigns.lua b/nvim/plugin/gitsigns.lua
index 1d61095..5dd0de8 100644
--- a/nvim/plugin/gitsigns.lua
+++ b/nvim/plugin/gitsigns.lua
@@ -3,40 +3,38 @@ 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,
-    on_attach = function()
-      local gs = package.loaded.gitsigns
-      vim.keymap.set('n', '<leader>gg', gs.preview_hunk, { desc = 'git preview hunk' })
-      vim.keymap.set('n', '<leader>gb', function()
-        gs.blame_line { full = true }
-      end, { desc = 'git blame_line' })
-      vim.keymap.set('n', '<leader>gr', gs.reset_hunk, { desc = 'git reset hunk' })
-      vim.keymap.set('v', '<leader>gr', function()
-        gs.reset_hunk { vim.fn.line('.'), vim.fn.line('v') }
-      end, { desc = 'git reset hunk' })
-      -- Navigation
-      vim.keymap.set('n', ']g', function()
-        if vim.wo.diff then
-          return ']c'
-        end
-        vim.schedule(function()
-          gs.next_hunk()
-        end)
-        return '<Ignore>'
-      end, { expr = true })
+require('gitsigns').setup {
+  signcolumn = false,
+  numhl = true,
+  on_attach = function()
+    local gs = package.loaded.gitsigns
+    vim.keymap.set('n', '<leader>gg', gs.preview_hunk, { desc = 'git preview hunk' })
+    vim.keymap.set('n', '<leader>gb', function()
+      gs.blame_line { full = true }
+    end, { desc = 'git blame_line' })
+    vim.keymap.set('n', '<leader>gr', gs.reset_hunk, { desc = 'git reset hunk' })
+    vim.keymap.set('v', '<leader>gr', function()
+      gs.reset_hunk { vim.fn.line('.'), vim.fn.line('v') }
+    end, { desc = 'git reset hunk' })
+    -- Navigation
+    vim.keymap.set('n', ']g', function()
+      if vim.wo.diff then
+        return ']c'
+      end
+      vim.schedule(function()
+        gs.next_hunk()
+      end)
+      return '<Ignore>'
+    end, { expr = true })
 
-      vim.keymap.set('n', '[g', function()
-        if vim.wo.diff then
-          return '[c'
-        end
-        vim.schedule(function()
-          gs.prev_hunk()
-        end)
-        return '<Ignore>'
-      end, { expr = true })
-    end,
-  }
-end)
+    vim.keymap.set('n', '[g', function()
+      if vim.wo.diff then
+        return '[c'
+      end
+      vim.schedule(function()
+        gs.prev_hunk()
+      end)
+      return '<Ignore>'
+    end, { expr = true })
+  end,
+}
diff --git a/nvim/plugin/keymaps.lua b/nvim/plugin/keymaps.lua
index 8787061..9a5056e 100644
--- a/nvim/plugin/keymaps.lua
+++ b/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>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>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>yd', '"*d', { noremap = true, silent = true, desc = 'Delete to clip' })
diff --git a/nvim/plugin/lsp.lua b/nvim/plugin/lsp.lua
index 5dde0b3..6156159 100644
--- a/nvim/plugin/lsp.lua
+++ b/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,
diff --git a/nvim/plugin/mini.lua b/nvim/plugin/mini.lua
index e36b970..39d1729 100644
--- a/nvim/plugin/mini.lua
+++ b/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' },
 }
diff --git a/nvim/plugin/misc.lua b/nvim/plugin/misc.lua
index c567fcc..9d08c8d 100644
--- a/nvim/plugin/misc.lua
+++ b/nvim/plugin/misc.lua
@@ -18,3 +18,5 @@ require('toggleterm').setup {
 require('which-key').setup {
   preset = 'helix',
 }
+require('trouble').setup {}
+require('eyeliner').setup {}
diff --git a/nvim/plugin/statuscol.lua b/nvim/plugin/statuscol.lua
deleted file mode 100644
index 1cc61f1..0000000
--- a/nvim/plugin/statuscol.lua
+++ /dev/null
@@ -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,
-}
diff --git a/nvim/plugin/treesitter.lua b/nvim/plugin/treesitter.lua
index 0ac66cd..ab11674 100644
--- a/nvim/plugin/treesitter.lua
+++ b/nvim/plugin/treesitter.lua
@@ -63,4 +63,5 @@ require('nvim-treesitter.configs').setup {
 
 require('treesitter-context').setup {
   max_lines = 3,
+  min_window_height = 50
 }