resolving conflict

3 files changed, 18 insertions, 6 deletions

diff --git a/vim/mySnippets/vim.snippets b/vim/mySnippets/vim.snippets
index 41f9024..e69de29 100644
--- a/vim/mySnippets/vim.snippets
+++ b/vim/mySnippets/vim.snippets
@@ -1,3 +0,0 @@
-snippet test "Description" b
-tste
-endsnippet
diff --git a/vim/vimrc b/vim/vimrc
index 26b9e5c..948413a 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -53,15 +53,26 @@ function! SynctexShow()
         exec execline
     end
 endfunction
-nnoremap <Leader>lv :call SynctexShow()<CR><CR>
-nnoremap <Leader>lc :Latexmk<CR>
-nnoremap <Leader>ls :LatexmkStop<CR>:LatexmkClean<CR>
+
+" Access
+nnoremap <LocalLeader>a :call SynctexShow()<CR><CR>
+
+" Initiate
+nnoremap <LocalLeader>i :Latexmk<CR>
+
+" Open
+nnoremap <LocalLeader>o :LatexView<CR>
+
+" Kill
+nnoremap <LocalLeader>k :LatexmkStop<CR>:LatexmkClean<CR>
 
 "  Gundo
 nnoremap <F5> :GundoToggle<cr>
 
 "  Nerdtree
 nnoremap <F3> :NERDTreeToggle<cr>
+
+
 let NERDTreeIgnore=['\.pdf$', '\~$','\.toc$',
             \ '\.fls$','\.bbl$','\.blg$',
             \ '\.out$', '\.log$','\.aux$','\.sty$',
diff --git a/zshrc b/zshrc
index 385c70b..5645305 100644
--- a/zshrc
+++ b/zshrc
@@ -48,6 +48,10 @@ alias cdd='cd ~/dotfiles'
 alias tmux="TERM=screen-256color-bce tmux"
 alias g='git'
 alias v=$EDITOR
+alias tmux="TERM=screen-256color-bce tmux"
+alias g='git'
+alias v='vim'
+alias vs="vim --servername SYNCTEX"
 alias c='clear'
 alias m='mutt'
 alias a='vifm'