3 files changed, 36 insertions, 7 deletions
diff --git a/nvim/lua/config/lazy.lua b/nvim/lua/config/lazy.lua
index 11d41e0..a4c6f2a 100644
--- a/nvim/lua/config/lazy.lua
+++ b/nvim/lua/config/lazy.lua
@@ -18,7 +18,7 @@ vim.opt.rtp:prepend(lazypath)
 -- Make sure to setup `mapleader` and `maplocalleader` before
 -- loading lazy.nvim so that mappings are correct.
 -- This is also a good place to setup other settings (vim.opt)
-vim.g.mapleader = " "
+vim.g.mapleader = "\\" 
 vim.g.maplocalleader = ","
 
 -- Create some keymaps for moving between vim windows without <C-w>, as it
diff --git a/nvim/lua/plugins/airline.lua b/nvim/lua/plugins/airline.lua
new file mode 100644
index 0000000..a52e9be
--- /dev/null
+++ b/nvim/lua/plugins/airline.lua
@@ -0,0 +1,15 @@
+return {
+  -- airline
+  { "vim-airline/vim-airline",
+    init = function()
+      vim.g.airline_powerline_fonts = 1
+      vim.g["airline#extensions#tabline#enabled"] = 1
+      vim.g["airline#extensions#branch#enabled"] = 1
+      end,
+  },
+  { "vim-airline/vim-airline-themes",
+    init = function()
+      vim.g.airline_theme = 'wombat'
+      end,
+  }
+}
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" }
 }