Merge branch 'main' of gdb:dotfiles

3 files changed, 24 insertions, 3 deletions

diff --git a/config/essentials/nvim/after/plugin/autoclose.lua b/config/essentials/nvim/after/plugin/autoclose.lua
new file mode 100644
index 0000000..6209c81
--- /dev/null
+++ b/config/essentials/nvim/after/plugin/autoclose.lua
@@ -0,0 +1,20 @@
+require("autoclose").setup({
+   keys = {
+      ["("] = { escape = false, close = true, pair = "()"},
+      ["["] = { escape = false, close = true, pair = "[]"},
+      ["{"] = { escape = false, close = true, pair = "{}"},
+
+      [">"] = { escape = true, close = false, pair = "<>"},
+      [")"] = { escape = true, close = false, pair = "()"},
+      ["]"] = { escape = true, close = false, pair = "[]"},
+      ["}"] = { escape = true, close = false, pair = "{}"},
+
+      ['"'] = { escape = true, close = true, pair = '""'},
+      ["'"] = { escape = true, close = true, pair = "''"},
+      ["`"] = { escape = true, close = true, pair = "``"},
+   },
+   options = {
+      disabled_filetypes = { "text" },
+      disable_when_touch = true,
+   },
+})
diff --git a/config/essentials/nvim/lua/user/packer.lua b/config/essentials/nvim/lua/user/packer.lua
index 42328aa..a4803a3 100644
--- a/config/essentials/nvim/lua/user/packer.lua
+++ b/config/essentials/nvim/lua/user/packer.lua
@@ -26,11 +26,12 @@ return require('packer').startup(function(use)
 
 	use('tpope/vim-capslock')
 	use('tpope/vim-commentary')
-	use('tpope/vim-endwise')
+	-- use('tpope/vim-endwise')
 	use('tpope/vim-fugitive')
 	use('tpope/vim-repeat')
 	use('tpope/vim-surround')
 	use('tpope/vim-vinegar')
+	use('m4xshen/autoclose.nvim')
 
 	-- utils
 	use('godlygeek/tabular')
diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh
index da6df04..c260891 100644
--- a/config/essentials/zsh/functions.zsh
+++ b/config/essentials/zsh/functions.zsh
@@ -15,11 +15,11 @@ vimh() {
 }
 nvf() {
 	local cache="$HOME/.cache/nvf"
-	local match="$(grep -m1 "$1" "$cache" 2> /dev/null)"
+	local match="$(grep -m1 "$1$" "$cache" 2> /dev/null)"
 	if test ! -f "$match"
 	then
 		die "resetting cache..."
-		match="$(goo | tee "$cache" | grep -m 1 "$1" 2> /dev/null)"
+		match="$(goo | tee "$cache" | grep -m 1 "$1$" 2> /dev/null)"
 		# # Alternative:
 		# match="$(goo | grep -m 1 "$1" 2> /dev/null | tee -a | "$cache")"
 	fi