From 62faba9b5db29d4bc170fb7d278350786d55b76d Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Mon, 26 Oct 2015 17:08:03 +0100
Subject: misc

Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
 .gitconfig            | 1 +
 .gitmodules           | 3 +++
 .tmux.conf            | 2 +-
 .vim/bundle/LaTeX-Box | 1 +
 .vimrc                | 4 ++++
 .zshrc                | 1 +
 6 files changed, 11 insertions(+), 1 deletion(-)
 create mode 160000 .vim/bundle/LaTeX-Box

diff --git a/.gitconfig b/.gitconfig
index 8a95fab..1680f55 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -21,6 +21,7 @@
 	mnf = merge --no-ff
 	ours   = "!f() { git checkout --ours $@ && git add $@; }; f"
 	theirs = "!f() { git checkout --theirs $@ && git add $@; }; f"
+	p = push --follow-tags
 [merge]
 	tool = vimdiff
 	conflictstyle = diff3
diff --git a/.gitmodules b/.gitmodules
index 022bad1..32d53a0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -76,3 +76,6 @@
 [submodule ".vim/bundle/splice.vim"]
 	path = .vim/bundle/splice.vim
 	url = https://github.com/sjl/splice.vim.git
+[submodule ".vim/bundle/LaTeX-Box"]
+	path = .vim/bundle/LaTeX-Box
+	url = https://github.com/LaTeX-Box-Team/LaTeX-Box.git
diff --git a/.tmux.conf b/.tmux.conf
index f9d49aa..146cf9d 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -47,7 +47,7 @@ setw -g utf8 on
 setw -g automatic-rename on
 setw -g clock-mode-style 24
 setw -g mode-keys vi
-setw -g mode-mouse on
+#setw -g mode-mouse on
 setw -g aggressive-resize on
 
 set -g prefix C-a
diff --git a/.vim/bundle/LaTeX-Box b/.vim/bundle/LaTeX-Box
new file mode 160000
index 0000000..3c2901e
--- /dev/null
+++ b/.vim/bundle/LaTeX-Box
@@ -0,0 +1 @@
+Subproject commit 3c2901e12cb78bfb2be58ba4c62a488612550fe1
diff --git a/.vimrc b/.vimrc
index 186164b..761758f 100644
--- a/.vimrc
+++ b/.vimrc
@@ -54,10 +54,13 @@ set complete+=k " enable dictionary completion
 set completeopt=menuone,menu,longest
 
 let mapleader = ","
+let maplocalleader = "\\"
 
 let g:sudo_no_gui = 1
 
 let g:ycm_extra_conf_globlist = ['~/.ycm_extra_conf.py']
+
+let g:tex_flavor='latex'
 " }}}
 
 filetype off
@@ -85,6 +88,7 @@ Plugin 'adoy/vim-php-refactoring-toolbox'
 Plugin 'shawncplus/phpcomplete.vim'
 
 Plugin 'sjl/splice.vim'
+Plugin 'LaTeX-Box-Team/LaTeX-Box'
 
 call vundle#end()
 syntax on
diff --git a/.zshrc b/.zshrc
index 619475f..6007d1e 100644
--- a/.zshrc
+++ b/.zshrc
@@ -485,6 +485,7 @@ alias wget='nocorrect noglob wget'
 
 alias p='pacman'
 alias sd='systemctl'
+alias b='busybox'
 
 alias su='su -'
 
-- 
cgit v1.2.3-24-g4f1b