15 files changed, 26 insertions, 48 deletions
diff --git a/home/.config/nvim/after/ftplugin/c.lua b/home/.config/nvim/after/ftplugin/c.lua
deleted file mode 120000
index 48a225a..0000000
--- a/home/.config/nvim/after/ftplugin/c.lua
+++ /dev/null
@@ -1 +0,0 @@
-cpp.lua
-\ No newline at end of file
diff --git a/home/.config/nvim/after/ftplugin/cfg.lua b/home/.config/nvim/after/ftplugin/cfg.lua
deleted file mode 100644
index 3e79acd..0000000
--- a/home/.config/nvim/after/ftplugin/cfg.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-vim.bo.commentstring = "// %s"
-
-vim.b.undo_ftplugin = vim.b.undo_ftplugin .. "| setlocal commentstring<"
diff --git a/home/.config/nvim/after/ftplugin/cpp.lua b/home/.config/nvim/after/ftplugin/cpp.lua
deleted file mode 100644
index e3d3a8c..0000000
--- a/home/.config/nvim/after/ftplugin/cpp.lua
+++ /dev/null
@@ -1,2 +0,0 @@
-vim.bo.commentstring = "// %s"
-vim.b.undo_ftplugin = vim.b.undo_ftplugin .. "| setlocal commentstring<"
diff --git a/home/.config/nvim/after/ftplugin/dosini.lua b/home/.config/nvim/after/ftplugin/dosini.lua
deleted file mode 100644
index f6d7437..0000000
--- a/home/.config/nvim/after/ftplugin/dosini.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-vim.bo.commentstring = "# %s"
-vim.b.undo_ftplugin = vim.b.undo_ftplugin
-    .. "|setlocal commentstring"
diff --git a/home/.config/nvim/after/ftplugin/gitcommit.lua b/home/.config/nvim/after/ftplugin/gitcommit.lua
index 8525714..9095ee4 100644
--- a/home/.config/nvim/after/ftplugin/gitcommit.lua
+++ b/home/.config/nvim/after/ftplugin/gitcommit.lua
@@ -1,5 +1,3 @@
 vim.wo.spell = true
 vim.b.undo_ftplugin = vim.b.undo_ftplugin .. "|setlocal spell<"
 vim.cmd([[match ErrorMsg /\%1l.\%>50v/]])
-local bufnr = vim.api.nvim_buf_get_number(0)
-require("mapper").ncmd("gd", "DiffGitCached", nil, bufnr)
diff --git a/home/.config/nvim/after/ftplugin/gitrebase.lua b/home/.config/nvim/after/ftplugin/gitrebase.lua
index 38a2153..0fc4102 100644
--- a/home/.config/nvim/after/ftplugin/gitrebase.lua
+++ b/home/.config/nvim/after/ftplugin/gitrebase.lua
@@ -1,20 +1,11 @@
-local map = require("mapper")
-local ncmd = map.ncmd
-local vcmd = map.vcmd
-local bufnr = 0
+local function nvmap(l, r, desc)
+  vim.keymap.set({ "n", "v" }, l, r, { buffer = 0, desc = desc })
+end
 
-ncmd("gc", "Cycle", nil, bufnr)
-ncmd("gp", "Pick", nil, bufnr)
-ncmd("ge", "Edit", nil, bufnr)
-ncmd("gf", "Fixup", nil, bufnr)
-ncmd("gd", "Drop", nil, bufnr)
-ncmd("gs", "Squash", nil, bufnr)
-ncmd("gr", "Reword", nil, bufnr)
-
-vcmd("gc", "Cycle", nil, bufnr)
-vcmd("gp", "Pick", nil, bufnr)
-vcmd("ge", "Edit", nil, bufnr)
-vcmd("gf", "Fixup", nil, bufnr)
-vcmd("gd", "Drop", nil, bufnr)
-vcmd("gs", "Squash", nil, bufnr)
-vcmd("gr", "Reword", nil, bufnr)
+nvmap("gc", "Cycle", "[C]ycle")
+nvmap("gp", "Pick", "[P]ick")
+nvmap("ge", "Edit", "[E]dit")
+nvmap("gf", "Fixup", "[F]ixup")
+nvmap("gd", "Drop", "[D]rop")
+nvmap("gs", "Squash", "[S]quash")
+nvmap("gr", "Reword", "[R]eword")
diff --git a/home/.config/nvim/after/ftplugin/help.lua b/home/.config/nvim/after/ftplugin/help.lua
deleted file mode 100644
index 63147a6..0000000
--- a/home/.config/nvim/after/ftplugin/help.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-vim.keymap.set("n", "q", function()
-  vim.api.nvim_win_close(0, false)
-end, { buffer = true })
diff --git a/home/.config/nvim/after/ftplugin/json.lua b/home/.config/nvim/after/ftplugin/json.lua
deleted file mode 100644
index 726acd0..0000000
--- a/home/.config/nvim/after/ftplugin/json.lua
+++ /dev/null
@@ -1 +0,0 @@
-vim.cmd([[syntax match Comment +\/\/.\+$+]])
diff --git a/home/.config/nvim/after/ftplugin/mail.lua b/home/.config/nvim/after/ftplugin/mail.lua
index 538c10b..9fe1500 100644
--- a/home/.config/nvim/after/ftplugin/mail.lua
+++ b/home/.config/nvim/after/ftplugin/mail.lua
@@ -1,2 +1 @@
 vim.wo.spell = true
-vim.b.undo_ftplugin = vim.b.undo_ftplugin .. "|setlocal spell<"
diff --git a/home/.config/nvim/after/ftplugin/markdown.lua b/home/.config/nvim/after/ftplugin/markdown.lua
index 538c10b..9fe1500 100644
--- a/home/.config/nvim/after/ftplugin/markdown.lua
+++ b/home/.config/nvim/after/ftplugin/markdown.lua
@@ -1,2 +1 @@
 vim.wo.spell = true
-vim.b.undo_ftplugin = vim.b.undo_ftplugin .. "|setlocal spell<"
diff --git a/home/.config/nvim/after/ftplugin/sxhkdrc.lua b/home/.config/nvim/after/ftplugin/sxhkdrc.lua
new file mode 100644
index 0000000..327c5a0
--- /dev/null
+++ b/home/.config/nvim/after/ftplugin/sxhkdrc.lua
@@ -0,0 +1,10 @@
+vim.bo.commentstring = "# %s"
+
+vim.api.nvim_create_autocmd(
+  "BufWritePost",
+  {
+    group = vim.api.nvim_create_augroup("sxhkd", { clear = true }),
+    buffer = 0,
+    command = "!pkill --signal SIGUSR1 sxhkd",
+  }
+)
diff --git a/home/.config/nvim/after/ftplugin/tex.lua b/home/.config/nvim/after/ftplugin/tex.lua
deleted file mode 100644
index b1dbce0..0000000
--- a/home/.config/nvim/after/ftplugin/tex.lua
+++ /dev/null
@@ -1,4 +0,0 @@
-vim.wo.spell = true
-vim.bo.formatoptions = vim.bo.formatoptions .. "t"
-vim.b.undo_ftplugin = vim.b.undo_ftplugin
-  .. "|setlocal spell< |setlocal formatoptions<"
diff --git a/home/.config/nvim/after/ftplugin/text.lua b/home/.config/nvim/after/ftplugin/text.lua
index 8c72f6f..2179c42 100644
--- a/home/.config/nvim/after/ftplugin/text.lua
+++ b/home/.config/nvim/after/ftplugin/text.lua
@@ -1,5 +1,3 @@
 vim.wo.spell = true
 vim.bo.formatoptions = vim.bo.formatoptions .. "t"
 vim.bo.commentstring = "# %s"
-vim.b.undo_ftplugin = vim.b.undo_ftplugin
-  .. "|setlocal spell< |setlocal formatoptions< |setlocal commentstring"
diff --git a/home/.config/nvim/after/ftplugin/tmux.lua b/home/.config/nvim/after/ftplugin/tmux.lua
deleted file mode 100644
index 590a12e..0000000
--- a/home/.config/nvim/after/ftplugin/tmux.lua
+++ /dev/null
@@ -1 +0,0 @@
-vim.api.nvim_create_autocmd("BufWritePost", { buffer = 0, command = "make" })
diff --git a/home/.config/nvim/after/ftplugin/xdefaults.lua b/home/.config/nvim/after/ftplugin/xdefaults.lua
index 0f4ec99..09dbce3 100644
--- a/home/.config/nvim/after/ftplugin/xdefaults.lua
+++ b/home/.config/nvim/after/ftplugin/xdefaults.lua
@@ -1,9 +1,10 @@
 vim.bo.commentstring = "! %s"
-vim.api.nvim_create_augroup("xdefaults", {})
+
 vim.api.nvim_create_autocmd(
   "BufWritePost",
-  { group = "xdefaults", buffer = 0, command = "!xrdb %" }
+  {
+    group = vim.api.nvim_create_augroup("xdefaults", { clear = true }),
+    buffer = 0,
+    command = "!xrdb %",
+  }
 )
-
-vim.b.undo_ftplugin = vim.b.undo_ftplugin
-  .. "| setlocal commentstring<