3 files changed, 37 insertions, 13 deletions
diff --git a/nvim/lua/plugins/R.lua b/nvim/lua/plugins/R.lua
index b4dec39..1188a26 100644
--- a/nvim/lua/plugins/R.lua
+++ b/nvim/lua/plugins/R.lua
@@ -36,13 +36,8 @@ return {
                 "RSaveClose",
             },
         }
-        -- Check if the environment variable "R_AUTO_START" exists.
-        -- If using fish shell, you could put in your config.fish:
-        -- alias r "R_AUTO_START=true nvim"
-        if vim.env.R_AUTO_START == "true" then
-            opts.auto_start = "on startup"
-            opts.objbr_auto_start = true
-        end
+        opts.auto_start = "on startup"
+        opts.objbr_auto_start = true
         require("r").setup(opts)
     end,
 }
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" }
 }