diff options
author | Florian Pritz <bluewind@xinu.at> | 2015-10-26 17:08:03 +0100 |
---|---|---|
committer | Florian Pritz <bluewind@xinu.at> | 2015-10-26 17:08:03 +0100 |
commit | 62faba9b5db29d4bc170fb7d278350786d55b76d (patch) | |
tree | fe56d9737d068ea2322a91e26a63b55d8c42f705 | |
parent | fe829316fe26791a07890a820ec7910d8991d701 (diff) | |
download | dotfiles-62faba9b5db29d4bc170fb7d278350786d55b76d.tar.gz dotfiles-62faba9b5db29d4bc170fb7d278350786d55b76d.tar.xz |
misc
Signed-off-by: Florian Pritz <bluewind@xinu.at>
-rw-r--r-- | .gitconfig | 1 | ||||
-rw-r--r-- | .gitmodules | 3 | ||||
-rw-r--r-- | .tmux.conf | 2 | ||||
m--------- | .vim/bundle/LaTeX-Box | 0 | ||||
-rw-r--r-- | .vimrc | 4 | ||||
-rw-r--r-- | .zshrc | 1 |
6 files changed, 10 insertions, 1 deletions
@@ -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 @@ -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 +Subproject 3c2901e12cb78bfb2be58ba4c62a488612550fe @@ -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 @@ -485,6 +485,7 @@ alias wget='nocorrect noglob wget' alias p='pacman' alias sd='systemctl' +alias b='busybox' alias su='su -' |