nvim: updates, improvements, and cleanup

7 files changed, 15 insertions, 63 deletions

diff --git a/dot_config/nvim/lua/bindings.lua b/dot_config/nvim/lua/bindings.lua
deleted file mode 100644
index 1fd379b..0000000
--- a/dot_config/nvim/lua/bindings.lua
+++ /dev/null
@@ -1,28 +0,0 @@
--- general bindings that aren't specific to a plugin
-require 'which-key'.register {
-	-- diagnostics
-	['<leader>'] = {
-		e = { vim.diagnostic.open_float, 'diag float' },
-		q = { vim.diagnostic.setloclist, 'diag locations' },
-	},
-	['[d'] = { vim.diagnostic.goto_prev, 'prev diag' },
-	[']d'] = { vim.diagnostic.goto_next, 'next diag' },
-
-	-- document missing builtins
-	['g'] = {
-		t = 'Next tab',
-		T = 'Previous tab',
-	},
-}
-
--- readline
-local readline = require 'readline'
-vim.keymap.set('!', '<M-Right>', readline.forward_word)
-vim.keymap.set('!', '<M-Left>', readline.backward_word)
-vim.keymap.set('!', '<C-a>', readline.beginning_of_line)
-vim.keymap.set('!', '<C-e>', readline.end_of_line)
-vim.keymap.set('!', '<M-d>', readline.kill_word)
-vim.keymap.set('!', '<M-BS>', readline.backward_kill_word)
-vim.keymap.set('!', '<C-w>', readline.unix_word_rubout)
-vim.keymap.set('!', '<C-k>', readline.kill_line)
-vim.keymap.set('!', '<C-u>', readline.backward_kill_line)
diff --git a/dot_config/nvim/lua/bindings/init.lua b/dot_config/nvim/lua/bindings/init.lua
index 622f23d..01b83b0 100644
--- a/dot_config/nvim/lua/bindings/init.lua
+++ b/dot_config/nvim/lua/bindings/init.lua
@@ -1,7 +1,6 @@
 for _, v in ipairs {
 	'builtins',
 	'plugins',
-	'readline',
 } do
 	require ('bindings.' .. v)
 end
diff --git a/dot_config/nvim/lua/bindings/readline.lua b/dot_config/nvim/lua/bindings/readline.lua
deleted file mode 100644
index 64e3042..0000000
--- a/dot_config/nvim/lua/bindings/readline.lua
+++ /dev/null
@@ -1,10 +0,0 @@
-local readline = require 'readline'
-vim.keymap.set('!', '<M-Right>', readline.forward_word)
-vim.keymap.set('!', '<M-Left>', readline.backward_word)
-vim.keymap.set('!', '<C-a>', readline.beginning_of_line)
-vim.keymap.set('!', '<C-e>', readline.end_of_line)
-vim.keymap.set('!', '<M-d>', readline.kill_word)
-vim.keymap.set('!', '<M-BS>', readline.backward_kill_word)
-vim.keymap.set('!', '<C-w>', readline.unix_word_rubout)
-vim.keymap.set('!', '<C-k>', readline.kill_line)
-vim.keymap.set('!', '<C-u>', readline.backward_kill_line)
diff --git a/dot_config/nvim/lua/plugins/bindings.lua b/dot_config/nvim/lua/plugins/bindings.lua
deleted file mode 100644
index 1b4a06c..0000000
--- a/dot_config/nvim/lua/plugins/bindings.lua
+++ /dev/null
@@ -1,11 +0,0 @@
-return {
-	{
-		'folke/which-key.nvim',
-		lazy = true,
-		opts = {},
-	},
-	{
-		'linty-org/readline.nvim',
-		lazy = true,
-	},
-}
diff --git a/dot_config/nvim/lua/plugins/bindings/init.lua b/dot_config/nvim/lua/plugins/bindings/init.lua
index 1b4a06c..56694b0 100644
--- a/dot_config/nvim/lua/plugins/bindings/init.lua
+++ b/dot_config/nvim/lua/plugins/bindings/init.lua
@@ -5,7 +5,6 @@ return {
 		opts = {},
 	},
 	{
-		'linty-org/readline.nvim',
-		lazy = true,
+		'tpope/vim-rsi'
 	},
 }
diff --git a/dot_config/nvim/lua/plugins/init.lua b/dot_config/nvim/lua/plugins/init.lua
index 1246a2c..a164d6f 100644
--- a/dot_config/nvim/lua/plugins/init.lua
+++ b/dot_config/nvim/lua/plugins/init.lua
@@ -1,8 +1,20 @@
+local conjureft = {
+	'clojure',
+	'fennel',
+	'hy',
+	'janet',
+	'julia',
+	'lisp',
+	'racket',
+	'scheme'
+}
+
 -- simple stuff that doesn't need any handling
 -- and doesn't fit in elsewhere
 return {
 	{ 'folke/lazy.nvim', version = false },
 	{ "Olical/nfnl", ft = "fennel" },
+	{ 'stevearc/dressing.nvim', opts = {}},
 	{
 		'Olical/conjure',
 		config = function(_, opts)
@@ -14,17 +26,9 @@ return {
 			['mapping#prefix'] = '<localleader>e',
 			['extract#tree_sitter#enabled'] = true,
 			-- disabling lua, python, rust
-			filetypes = {
-				'clojure',
-				'fennel',
-				'hy',
-				'janet',
-				'julia',
-				'lisp',
-				'racket',
-				'scheme',
-			},
+			filetypes = conjureft,
 			['filetype#fennel'] = 'conjure.client.fennel.stdio',
 		},
+		ft = conjureft,
 	},
 }
diff --git a/dot_config/nvim/lua/plugins/mini/init.lua b/dot_config/nvim/lua/plugins/mini/init.lua
index 03a5855..6986454 100644
--- a/dot_config/nvim/lua/plugins/mini/init.lua
+++ b/dot_config/nvim/lua/plugins/mini/init.lua
@@ -8,7 +8,6 @@ return {
 			end
 		end,
 		opts = function()
-			local starter = require 'mini.starter'
 			return {
 				ai = {},
 				align = {},