Merge branch 'master' of https://github.com/faerbit/.dotfiles
This commit is contained in:
commit
53513af0f7
@ -6,5 +6,6 @@
|
||||
[core]
|
||||
editor = vim -c 'startinsert'
|
||||
excludesfile = ~/.globalgitignore
|
||||
pager = less -F -X
|
||||
[push]
|
||||
default = simple
|
||||
|
@ -1 +1,2 @@
|
||||
*.swp
|
||||
*.swo
|
||||
|
5
vimrc
5
vimrc
@ -18,6 +18,8 @@ if exists("*vundle#begin")
|
||||
Plugin 'garbas/vim-snipmate'
|
||||
Plugin 'honza/vim-snippets'
|
||||
Plugin 'alfredodeza/coveragepy.vim'
|
||||
Plugin 'tikhomirov/vim-glsl'
|
||||
Plugin 'ntpeters/vim-better-whitespace'
|
||||
|
||||
" All of your Plugins must be added before the following line
|
||||
call vundle#end() " required
|
||||
@ -59,6 +61,9 @@ if argc() == 2
|
||||
endif
|
||||
|
||||
"Map <F8> on python files
|
||||
au FileType python :map <F8> i <F8>
|
||||
au FileType python :imap <F8> import pdb; pdb.set_trace()<ESC>
|
||||
"Map <F10> on python files
|
||||
au FileType python :map <F10> :Coveragepy show<cr>
|
||||
au FileType python :imap <F10> <Esc><F10>
|
||||
|
||||
|
@ -75,3 +75,7 @@ pacman_disowned(){
|
||||
|
||||
comm -23 "$fs" "$db"
|
||||
}
|
||||
|
||||
virtual_env_prompt() {
|
||||
REPLY=${VIRTUAL_ENV+(${VIRTUAL_ENV:t}) }
|
||||
}
|
||||
|
49
zshrc
49
zshrc
@ -1,8 +1,26 @@
|
||||
# source all other zsh files
|
||||
if [ -f .zsh_environment ]
|
||||
then
|
||||
source ~/.zsh_environment
|
||||
fi
|
||||
#for accounts whithout root
|
||||
if [ -f .zsh_grml ]
|
||||
then
|
||||
source ~/.zsh_grml
|
||||
fi
|
||||
#for untrusted machines
|
||||
if [ -f .zsh_sensitive ]
|
||||
then
|
||||
source ~/.zsh_sensitive
|
||||
fi
|
||||
source ~/.zsh_functions
|
||||
export EDITOR=vim
|
||||
|
||||
alias sudo='sudo '
|
||||
alias tasks="ps -u fab"
|
||||
alias update-grub="grub-mkconfig -o /boot/grub/grub.cfg"
|
||||
alias sml2p='/home/fab/.Sync-my-L2P/Sync-my-L2P.run'
|
||||
alias update-mirrors='sh -c "reflector -p http -l 20 --sort rate | tee /etc/pacman.d/mirrorlist"'
|
||||
alias update-mirrors='sh -c "reflector -p http -l 50 --sort rate | tee /etc/pacman.d/mirrorlist"'
|
||||
alias ssh='ssh '
|
||||
alias ping='ping '
|
||||
alias aur-update='pacaur -Syu --devel --noconfirm'
|
||||
@ -41,15 +59,42 @@ fi
|
||||
source ~/.zsh_functions
|
||||
export EDITOR=vim
|
||||
export PATH=$PATH:/home/fab/bin:/home/fab/.gem/ruby/2.1.0/bin
|
||||
alias emacs='emacs -nw'
|
||||
alias aiawiki='ssh aia -L 80:ldap2:80'
|
||||
alias rbtv='livestreamer twitch.tv/rocketbeanstv &'
|
||||
alias taketv='livestreamer twitch.tv/taketv &'
|
||||
alias ls='ls --color=auto'
|
||||
export ASPROOT=~/.asp
|
||||
export PATH=$PATH:/home/fab/bin:/home/fab/.gem/ruby/2.2.0/bin
|
||||
export LFS=/mnt/lfs
|
||||
|
||||
#vi mode
|
||||
bindkey -v
|
||||
export KEYTIMEOUT=1
|
||||
|
||||
bindkey -M viins 'fd' vi-cmd-mode
|
||||
bindkey -M vicmd 'k' history-beginning-search-backward
|
||||
bindkey -M vicmd 'j' history-beginning-search-forward
|
||||
|
||||
#backspace working after returning from command mode
|
||||
bindkey '^?' backward-delete-char
|
||||
bindkey '^h' backward-delete-char
|
||||
|
||||
if [ -f /usr/share/doc/pkgfile/command-not-found.zsh ]
|
||||
then
|
||||
source /usr/share/doc/pkgfile/command-not-found.zsh
|
||||
fi
|
||||
|
||||
if [ -f /usr/bin/virtualenvwrapper_lazy.sh ]
|
||||
then
|
||||
# Automatically source virtualenv
|
||||
source /usr/bin/virtualenvwrapper_lazy.sh
|
||||
fi
|
||||
|
||||
if [ -f /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh ]
|
||||
then
|
||||
source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
|
||||
fi
|
||||
|
||||
# displaying current virtual env
|
||||
grml_theme_add_token virtual-env -f virtual_env_prompt '%F{magenta}' '%f'
|
||||
zstyle ':prompt:grml:left:setup' items rc virtual-env change-root user at host path vcs percent
|
||||
|
Loading…
Reference in New Issue
Block a user