dot-bashrc

@@ -320,10 +320,10 @@ _surround() {
 }
 
 # Bindings using the '_surround' function
-bind -m vi-insert -x '"(":"_surround all \( \)"'
-bind -m vi-insert -x '"\"":"_surround all \" \""'
-bind -m vi-insert -x "\"'\": \"_surround all \' \'\""
-bind -m vi-insert -x '"{":"_surround word \{ \}"'
+bind -m vi-command -x '"(":"_surround all \( \)"'
+bind -m vi-command -x '"\"":"_surround all \" \""'
+bind -m vi-command -x "\"'\": \"_surround all \' \'\""
+bind -m vi-command -x '"{":"_surround word \{ \}"'
 
 #-----------------------------------------------------------------------------
 # FZF

dot-inputrc

@@ -10,3 +10,7 @@ Control-l: clear-screen
 
 # Autoclosing symbols
 "[": "\C-v[]\e[D"
+"(": "\C-v()\e[D"
+"{": "\C-v{}\e[D"
+"\"": "\C-v\"\C-v\"\e[D"
+"\'": "\C-v\'\C-v\'\e[D"