summaryrefslogtreecommitdiff
path: root/nvim/lua/plugins/misc.lua
diff options
context:
space:
mode:
Diffstat (limited to 'nvim/lua/plugins/misc.lua')
-rw-r--r--nvim/lua/plugins/misc.lua26
1 files changed, 20 insertions, 6 deletions
diff --git a/nvim/lua/plugins/misc.lua b/nvim/lua/plugins/misc.lua
index 431bece..7292e3f 100644
--- a/nvim/lua/plugins/misc.lua
+++ b/nvim/lua/plugins/misc.lua
@@ -1,8 +1,5 @@
return {
- -- airline
- { "vim-airline/vim-airline" },
- { "vim-airline/vim-airline-themes" },
-
+
-- pandoc
{ "vim-pandoc/vim-pandoc" },
{ "vim-pandoc/vim-pandoc-syntax" },
@@ -16,7 +13,12 @@ return {
-- Version control
{ "tpope/vim-fugitive" },
{ "airblade/vim-gitgutter" },
- { "samoshkin/vim-mergetool" },
+ { "samoshkin/vim-mergetool",
+ init = function()
+ vim.g.mergetool_layout = 'mr'
+ vim.g.mergetool_prefer_revision = 'local'
+ end,
+ },
-- Show an manage marks
{ "kshenoy/vim-signature" },
@@ -25,6 +27,18 @@ return {
{ "jasonccox/vim-wayland-clipboard" },
-- vimcmdline
- { "jalvesaq/vimcmdline" },
+ { "jalvesaq/vimcmdline",
+ init = function()
+ vim.b.cmdline_map_start = '<LocalLeader>s'
+ end,
+ },
+
+ -- fzf
+ { "junegunn/fzf" },
+
+ -- Look up docs in vim scripts with 'K'
+ { "tpope/vim-scriptease" },
+ -- Delete trailing whitespace
+ { "vim-scripts/DeleteTrailingWhitespace" }
}

Contact - Imprint