Merge branch 'master' of github.com:Faerbit/.dotfiles

This commit is contained in:
Faerbit 2016-04-04 00:41:51 +02:00
commit 313c772bf4
4 changed files with 9 additions and 2 deletions

View File

@ -9,3 +9,4 @@
pager = less -F -X
[push]
default = simple
followTags = true

6
vimrc
View File

@ -19,7 +19,8 @@ if exists("*vundle#begin")
Plugin 'honza/vim-snippets'
Plugin 'alfredodeza/coveragepy.vim'
Plugin 'tikhomirov/vim-glsl'
Plugin 'ntpeters/vim-better-whitespace'
Plugin 'chrisbra/vim-show-whitespace'
Plugin 'krisajenkins/vim-projectlocal'
" All of your Plugins must be added before the following line
call vundle#end() " required
@ -71,3 +72,6 @@ au FileType python :imap <F10> <Esc><F10>
"Map <F9> on Latex files
au FileType tex :map <F9> :! if [ -f Makefile ]; then; make; else; pdflatex %:t; rm *.aux; rm *.log; fi<cr>
"Highlight chars after column 80
match ErrorMsg '\%>80v.\+'

View File

@ -85,6 +85,7 @@ virtual_env_prompt() {
}
delete-old-archives() {
sudo tarsnap --fsck
archives=$(sudo tarsnap --list-archives | sort)
del_archives=$(echo $archives | head -n $(($(echo $archives | wc -l) - 3)))
del_archives=("${(@f)del_archives}")

3
zshrc
View File

@ -15,10 +15,11 @@ then
fi
source ~/.zsh_functions
export EDITOR=vim
export SYSTEMD_EDITOR=vim
alias sudo='sudo '
alias tasks="ps -u fab"
alias update-grub="grub-mkconfig -o /boot/grub/grub.cfg"
alias update-grub="sudo grub-mkconfig -o /boot/grub/grub.cfg"
alias sml2p='/home/fab/.Sync-my-L2P/Sync-my-L2P.run'
alias ssh='ssh '
alias ping='ping '