Use nvim for mergetool

[rbdr/dotfiles] / config / nvim / lua / plugins.lua

diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua
index 8b5b64b735b5570d0a59b1d7d20cf6425a6f8d13..971c441e52872eda3324a0ec52cbf448bc908c11 100644 (file)
--- a/config/nvim/lua/plugins.lua
+++ b/config/nvim/lua/plugins.lua
@@ -12,7 +12,36 @@ end
 vim.opt.rtp:prepend(lazypath)
 
 require('lazy').setup({
-  'junegunn/fzf',
+  {
+    "ibhagwan/fzf-lua",
+    config = function()
+      -- calling `setup` is optional for customization
+      require("fzf-lua").setup({
+        winopts={
+          width=1,
+          height=0.4,
+          row=1
+        },
+        fzf_opts={
+          ['--layout']='default'
+        },
+        fzf_colors = {
+          ['fg'] = {'fg', 'Normal'},
+          ['bg'] = {'bg', 'Normal'},
+          ['hl'] = {'fg', 'Comment'},
+          ['fg+'] = {'fg', 'CursorLine'},
+          ['bg+'] = {'bg', 'CursorLine'},
+          ['hl+'] = {'fg', 'Statement'},
+          ['info'] = {'fg', 'PreProc'},
+          ['prompt'] = {'fg', 'Conditional'},
+          ['pointer'] = {'fg', 'Exception'},
+          ['marker'] = {'fg', 'Keyword'},
+          ['spinner'] = {'fg', 'Label'},
+          ['header'] = {'fg', 'Comment'}
+        }
+      })
+    end
+  },
 
   -- Syntaxes
   'https://git.sr.ht/~rbdr/api-notation.vim',
@@ -31,19 +60,23 @@ require('lazy').setup({
   'dart-lang/dart-vim-plugin',
   'ziglang/zig.vim',
 
+  -- Debugging
+  'neovim/nvim-lspconfig',
+  'folke/neodev.nvim',
+  'mfussenegger/nvim-dap',
+  'rcarriga/nvim-dap-ui',
+
   -- Editing
   'tpope/vim-endwise',
   'rstacruz/vim-closer',
   'michaeljsmith/vim-indent-object',
 
-  -- Distraction free editing
-  'junegunn/goyo.vim',
-  'junegunn/limelight.vim',
-
   -- Tools
   {'neoclide/coc.nvim', branch='release'},
   'vim-scripts/LargeFile',
   'tpope/vim-fugitive',
-  'milkypostman/vim-togglelist',
-  'jremmen/vim-ripgrep',
+  'milkypostman/vim-togglelist'
 })
+
+require('dap_config')
+require("dapui").setup()