diff --git a/.config/nvim/lua/em/mappings/init.lua b/.config/nvim/lua/em/mappings/init.lua
deleted file mode 100644
index 6fb858cc..00000000
--- a/.config/nvim/lua/em/mappings/init.lua
+++ /dev/null
@@ -1,18 +0,0 @@
--- vim-test
-vim.g["test#strategy"] = "vtr"
-vim.api.nvim_set_keymap("n", "tn", ":TestNearest<cr>", { silent = true })
-vim.api.nvim_set_keymap("n", "tf", ":TestFile<cr>", { silent = true })
-vim.api.nvim_set_keymap("n", "ta", ":TestSuite<cr>", { silent = true })
-vim.api.nvim_set_keymap("n", "tl", ":TestLast<cr>", { silent = true }) 
-vim.api.nvim_set_keymap("n", "tv", ":TestVisit<cr>", { silent = true })
-
--- vim-tmux-runner
-vim.api.nvim_set_keymap("n", "ra", ":VtrAttachToPane<cr>", { noremap = true })
-vim.api.nvim_set_keymap("n", "rc", ":VtrClearRunner<cr>", { noremap = true })
-vim.api.nvim_set_keymap("n", "rf", ":VtrFocusRunner<cr>", { noremap = true })
-vim.api.nvim_set_keymap("n", "ro", ":VtrOpenRunner<cr>", { noremap = true })
-vim.api.nvim_set_keymap("n", "rk", ":VtrKillRunner<cr>", { noremap = true })
-
-
-vim.api.nvim_set_keymap("n", "<C-Q>", "db#op_exec()", { expr = true })
-vim.api.nvim_set_keymap("n", "<C-Q>", "db#op_exec()", { expr = true })
diff --git a/.config/nvim/plugin/loupe.lua b/.config/nvim/plugin/loupe.lua
new file mode 100644
index 00000000..362a407b
--- /dev/null
+++ b/.config/nvim/plugin/loupe.lua
@@ -0,0 +1,2 @@
+vim.g.LoupeCenterResults = 0
+vim.g.LoupeClearHighlightMap = 0
diff --git a/.config/nvim/plugin/scratch.lua b/.config/nvim/plugin/scratch.lua
new file mode 100644
index 00000000..16bc476e
--- /dev/null
+++ b/.config/nvim/plugin/scratch.lua
@@ -0,0 +1,10 @@
+vim.g.scratch_height = 20
+vim.g.scratch_insert_autohide = 0
+vim.g.scratch_no_mappings = 1
+vim.g.scratch_persistence_file = "project-notes.txt"
+
+-- Pneumonic: go to notes
+vim.api.nvim_set_keymap("n", "gN", "<plug>(scratch-insert-clear)", {})
+vim.api.nvim_set_keymap("n", "gn", "<plug>(scratch-insert-reuse)", {})
+vim.api.nvim_set_keymap("x", "gN", "<plug>(scratch-selection-clear)", {})
+vim.api.nvim_set_keymap("x", "gn", "<plug>(scratch-selection-reuse)", {})
diff --git a/.config/nvim/plugin/splitjoin.lua b/.config/nvim/plugin/splitjoin.lua
new file mode 100644
index 00000000..df1829f3
--- /dev/null
+++ b/.config/nvim/plugin/splitjoin.lua
@@ -0,0 +1,3 @@
+vim.g.splitjoin_ruby_curly_braces = 0
+vim.g.splitjoin_ruby_hanging_args = 0
+vim.g.splitjoin_ruby_options_as_arguments = 1
diff --git a/.config/nvim/plugin/vim-easy-align.lua b/.config/nvim/plugin/vim-easy-align.lua
new file mode 100644
index 00000000..fbfacd8c
--- /dev/null
+++ b/.config/nvim/plugin/vim-easy-align.lua
@@ -0,0 +1,2 @@
+vim.api.nvim_set_keymap("v", "<enter>", "<plug>(EasyAlign)", {})
+vim.api.nvim_set_keymap("n", "ga", "<plug>(EasyAlign)", {})
diff --git a/.config/nvim/plugin/vim-fugitive.lua b/.config/nvim/plugin/vim-fugitive.lua
new file mode 100644
index 00000000..3e4e5294
--- /dev/null
+++ b/.config/nvim/plugin/vim-fugitive.lua
@@ -0,0 +1 @@
+vim.g.fugitive_legacy_commands = 0
diff --git a/.config/nvim/plugin/vim-gista.lua b/.config/nvim/plugin/vim-gista.lua
new file mode 100644
index 00000000..6427ec30
--- /dev/null
+++ b/.config/nvim/plugin/vim-gista.lua
@@ -0,0 +1 @@
+vim.g["gista#command#post#default_public"] = 0
diff --git a/.config/nvim/plugin/vim-markdown.lua b/.config/nvim/plugin/vim-markdown.lua
new file mode 100644
index 00000000..d2df25c2
--- /dev/null
+++ b/.config/nvim/plugin/vim-markdown.lua
@@ -0,0 +1 @@
+vim.g.vim_markdown_new_list_item_indent = 2
diff --git a/.config/nvim/plugin/vim-test.lua b/.config/nvim/plugin/vim-test.lua
new file mode 100644
index 00000000..b88cd836
--- /dev/null
+++ b/.config/nvim/plugin/vim-test.lua
@@ -0,0 +1,7 @@
+vim.g["test#strategy"] = "vtr"
+
+vim.api.nvim_set_keymap("n", "tn", ":TestNearest<cr>", { silent = true })
+vim.api.nvim_set_keymap("n", "tf", ":TestFile<cr>", { silent = true })
+vim.api.nvim_set_keymap("n", "ta", ":TestSuite<cr>", { silent = true })
+vim.api.nvim_set_keymap("n", "tl", ":TestLast<cr>", { silent = true }) 
+vim.api.nvim_set_keymap("n", "tv", ":TestVisit<cr>", { silent = true })
diff --git a/.config/nvim/plugin/vim-tmux-runner.lua b/.config/nvim/plugin/vim-tmux-runner.lua
new file mode 100644
index 00000000..f102d3b7
--- /dev/null
+++ b/.config/nvim/plugin/vim-tmux-runner.lua
@@ -0,0 +1,5 @@
+vim.api.nvim_set_keymap("n", "ra", ":VtrAttachToPane<cr>", { noremap = true })
+vim.api.nvim_set_keymap("n", "rc", ":VtrClearRunner<cr>", { noremap = true })
+vim.api.nvim_set_keymap("n", "rf", ":VtrFocusRunner<cr>", { noremap = true })
+vim.api.nvim_set_keymap("n", "ro", ":VtrOpenRunner<cr>", { noremap = true })
+vim.api.nvim_set_keymap("n", "rk", ":VtrKillRunner<cr>", { noremap = true })