From 3042e747e5e22f2d0e022b69737731c9e97ff2ee Mon Sep 17 00:00:00 2001
From: Joe Groocock <frebib@gmail.com>
Date: Thu, 23 Nov 2017 21:26:29 +0000
Subject: [PATCH] Fix vimtex mapping breaking navigation Thanks, lervag!
 https://github.com/lervag/vimtex/issues/1004

---
 .config/vim/vimrc | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/.config/vim/vimrc b/.config/vim/vimrc
index 87c91fb..3a7603f 100644
--- a/.config/vim/vimrc
+++ b/.config/vim/vimrc
@@ -93,14 +93,6 @@ let vim_markdown_preview_browser='Chromium'
 let vim_markdown_preview_use_xdg_open=1
 let vim_markdown_preview_github=1
 
-" lervag/vimtex plugin
-nmap <silent><buffer> <Nop> <plug>(vimtex-env-delete)
-nmap <silent><buffer> <Nop> <plug>(vimtex-cmd-delete)
-nmap <silent><buffer> <Nop> <plug>(vimtex-env-delete-math)
-nmap <silent><buffer> <Nop> <plug>(vimtex-env-toggle-star)
-nmap <silent><buffer> <Nop> <plug>(vimtex-delim-toggle-modifier)
-xmap <silent><buffer> <Nop> <plug>(vimtex-delim-toggle-modifier)
-
 let mapleader="\<space>"
 " Unbind arrow keys
 for prefix in ['n', 'v']
@@ -179,6 +171,12 @@ if (exists("g:use_dvorak") && g:use_dvorak == 1)
 	noremap zh zj
 	noremap zt zk
 
+    " Disable some default vimtex mappings that conflict with rebound keys
+    let g:vimtex_mappings_disable = {
+        \ 'n': ['tse', 'tsd', 'tsD', 'tsc', 'dse', 'dsc', 'ds$', 'dsd'],
+        \ 'x': ['tsd', 'tsD'],
+        \}
+
 endif
 
 " Interface with system clipboard