dotfiles

My opinionated dotfiles
git clone git://git.erethon.com/dotfiles
Log | Files | Refs

commit fe313c9b6b10f2483cbfe692c86c24dc95d9bb06
parent dbd4edb9a6d8d0ddcc223478ee5311818c0a0531
Author: Erethon <info@erethon.com>
Date:   Wed,  9 Oct 2013 16:54:04 +0300

Updated bashrc, gitconfig and vimrc

Diffstat:
.bashrc | 5++++-
.gitconfig | 23+++++++++++++++++++++++
.vimrc | 23+++++++++++++++--------
README.md | 2+-
4 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/.bashrc b/.bashrc @@ -110,8 +110,11 @@ parse_git_branch() { git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ \[\1\]/' } -export PS1='\[\033[01;31m\]\u@\h\[\033[00m\]:\[\033[01;32m\]\w\[\033[00m\]\[\033[36m\]$(parse_git_branch)\[\033[00m\]\$ ' +export PS1='\[\033[31m\]\u@\h\[\033[00m\]:\[\033[32m\]\w\[\033[00m\]\[\033[36m\]$(parse_git_branch)\[\033[00m\]\$ ' +if [ -f /etc/bash_completion ]; then + . /etc/bash_completion +fi ####Adding stuff to path#### diff --git a/.gitconfig b/.gitconfig @@ -0,0 +1,23 @@ +[core] + mergeoptions = --no-ff --no-commit + editor = vim + +[user] + name = Erethon + email = info@erethon.com + +[merge] + ff = false + commit = false + +[color] + ui = true + +[alias] + co = checkout + st = status + go = log --graph --pretty=oneline --abbrev-commit + lp = log --pretty=oneline + b = branch + ba = branch -a + bl = blame diff --git a/.vimrc b/.vimrc @@ -16,9 +16,9 @@ set softtabstop=4 "Controls how many spaces are indented when > and < is used set shiftwidth=4 -"Remove trailing whitespace for .py and .rst files -autocmd BufWritePre *.py :%s/\s\+$//e -autocmd BufWritePre *.rst %s/\s\+$//e +"Remove trailing whitespace for .py and .rst files +autocmd BufWritePre *.py :%s/\s\+$//e +autocmd BufWritePre *.rst %s/\s\+$//e "Show line numbers set number @@ -40,8 +40,12 @@ set mat=2 colorscheme pychimp "Show a blue vertical line on the 80th character (pep8 compliant) -set colorcolumn=80 -highlight ColorColumn ctermbg=23 +if exists('+colorcolumn') + set colorcolumn=80 + highlight ColorColumn ctermbg=23 +else + au BufWinEnter * let w:m2=matchadd('ErrorMsg', '\%>80v.\+', -1) +endif """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" @@ -59,7 +63,7 @@ nnoremap <c-l> gt "Use ';' instead of ':' nnoremap ; : -"Faster Normal Mode +"Faster Normal Mode imap ii <Esc> "Pep8 checking @@ -68,14 +72,17 @@ map <F5> :!pep8 % <Enter> "Easy set paste and set nopaste set pastetoggle=<F2> +"Enable mouse in vim +set mouse=a + "Common typos -"imap +"imap """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" "Random Stuff """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" "Enable pathogen add ons -execute pathogen#infect() +"execute pathogen#infect() filetype indent plugin on diff --git a/README.md b/README.md @@ -1,4 +1,4 @@ ## Dotfiles Suggestions on how I could do something more efficiently or better, are always -welcome. +welcome.