9 files changed, 17 insertions, 31 deletions
diff --git a/dot_config/nvim/.chezmoiremove b/dot_config/nvim/.chezmoiremove
new file mode 100644
index 0000000..52fc454
--- /dev/null
+++ b/dot_config/nvim/.chezmoiremove
@@ -0,0 +1,2 @@
+lua/bindings/
+fnl/bindings/
diff --git a/dot_config/nvim/fnl/bindings.fnl b/dot_config/nvim/fnl/bindings.fnl
new file mode 100644
index 0000000..04ea594
--- /dev/null
+++ b/dot_config/nvim/fnl/bindings.fnl
@@ -0,0 +1,13 @@
+(import-macros {:mixed-table · : recc} :toast.macros)
+
+(recc :which-key :add
+  ; document missing builtins
+ [(· :gt & :desc "Next tab")
+  (· :gT & :desc "Previous tab")
+  ; diagnostics
+  (· :<leader>e vim.diagnostic.open_float & :desc "diag float")
+  (· :<leader>q vim.diagnostic.setloclist & :desc "diag locations")
+  (· "[d"       vim.diagnostic.goto_prev  & :desc "prev diag")
+  (· "]d"       vim.diagnostic.goto_next  & :desc "next diag")
+  ; plugin groups
+  (· :<leader>f & :desc :+find)])
diff --git a/dot_config/nvim/fnl/bindings/builtins.fnl b/dot_config/nvim/fnl/bindings/builtins.fnl
deleted file mode 100644
index dd96dfc..0000000
--- a/dot_config/nvim/fnl/bindings/builtins.fnl
+++ /dev/null
@@ -1,5 +0,0 @@
-; document missing builtins
-(import-macros {:mixed-table · : recc} :toast.macros)
-(recc :which-key :add
- [(· :gt & :desc "Next tab")
-  (· :gT & :desc "Previous tab")])
diff --git a/dot_config/nvim/fnl/bindings/init.fnl b/dot_config/nvim/fnl/bindings/init.fnl
deleted file mode 100644
index 80b6733..0000000
--- a/dot_config/nvim/fnl/bindings/init.fnl
+++ /dev/null
@@ -1,13 +0,0 @@
-(import-macros {:mixed-table · : recc} :toast.macros)
-
-(each [_ v (ipairs [:builtins
-                    :plugins])]
-  (require (.. :bindings. v)))
-
-; general bindings that aren't specific to a plugin
-(recc :which-key :add
-  ; diagnostics
- [(· :<leader>e vim.diagnostic.open_float & :desc "diag float")
-  (· :<leader>q vim.diagnostic.setloclist & :desc "diag locations")
-  (· "[d"       vim.diagnostic.goto_prev  & :desc "prev diag")
-  (· "]d"       vim.diagnostic.goto_next  & :desc "next diag")])
diff --git a/dot_config/nvim/fnl/bindings/plugins.fnl b/dot_config/nvim/fnl/bindings/plugins.fnl
deleted file mode 100644
index 97f09c7..0000000
--- a/dot_config/nvim/fnl/bindings/plugins.fnl
+++ /dev/null
@@ -1,4 +0,0 @@
-; plugin-specific category bindings
-(import-macros {:mixed-table · : recc} :toast.macros)
-(recc :which-key :add
- [(· :<leader>f & :desc :+find)])
diff --git a/dot_config/nvim/lua/bindings.lua b/dot_config/nvim/lua/bindings.lua
new file mode 100644
index 0000000..a323057
--- /dev/null
+++ b/dot_config/nvim/lua/bindings.lua
@@ -0,0 +1,2 @@
+-- [nfnl] Compiled from fnl/bindings.fnl by https://github.com/Olical/nfnl, do not edit.
+return require("which-key").add({{"gt", desc = "Next tab"}, {"gT", desc = "Previous tab"}, {"<leader>e", vim.diagnostic.open_float, desc = "diag float"}, {"<leader>q", vim.diagnostic.setloclist, desc = "diag locations"}, {"[d", vim.diagnostic.goto_prev, desc = "prev diag"}, {"]d", vim.diagnostic.goto_next, desc = "next diag"}, {"<leader>f", desc = "+find"}})
diff --git a/dot_config/nvim/lua/bindings/builtins.lua b/dot_config/nvim/lua/bindings/builtins.lua
deleted file mode 100644
index b6e02d7..0000000
--- a/dot_config/nvim/lua/bindings/builtins.lua
+++ /dev/null
@@ -1,2 +0,0 @@
--- [nfnl] Compiled from fnl/bindings/builtins.fnl by https://github.com/Olical/nfnl, do not edit.
-return (require("which-key")).add({{"gt", desc = "Next tab"}, {"gT", desc = "Previous tab"}})
diff --git a/dot_config/nvim/lua/bindings/init.lua b/dot_config/nvim/lua/bindings/init.lua
deleted file mode 100644
index 1b8c2b8..0000000
--- a/dot_config/nvim/lua/bindings/init.lua
+++ /dev/null
@@ -1,5 +0,0 @@
--- [nfnl] Compiled from fnl/bindings/init.fnl by https://github.com/Olical/nfnl, do not edit.
-for _, v in ipairs({"builtins", "plugins"}) do
-  require(("bindings." .. v))
-end
-return (require("which-key")).add({{"<leader>e", vim.diagnostic.open_float, desc = "diag float"}, {"<leader>q", vim.diagnostic.setloclist, desc = "diag locations"}, {"[d", vim.diagnostic.goto_prev, desc = "prev diag"}, {"]d", vim.diagnostic.goto_next, desc = "next diag"}})
diff --git a/dot_config/nvim/lua/bindings/plugins.lua b/dot_config/nvim/lua/bindings/plugins.lua
deleted file mode 100644
index 8bebd06..0000000
--- a/dot_config/nvim/lua/bindings/plugins.lua
+++ /dev/null
@@ -1,2 +0,0 @@
--- [nfnl] Compiled from fnl/bindings/plugins.fnl by https://github.com/Olical/nfnl, do not edit.
-return (require("which-key")).add({{"<leader>f", desc = "+find"}})