meineerde/dotfiles
1
0
Fork 0
mirror of https://github.com/meineerde/dotfiles.git synced 2025-10-17 19:41:01 +00:00
Code Issues Releases Activity

Fix merge conflict

Browse Source
This commit is contained in:
Holger Just 2011-07-18 12:33:54 +02:00
commit 6ccdfc6b9a
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
.bashrc
View File

@ -52,10 +52,13 @@ if [[ !`which install_ruby 2>/dev/null` ]] && [[ `which ruby 2>/dev/null` ]]; th
export RUBY_VERSION=$(ruby --version | sed -e "s/^ruby \(.\..\..\).*$/\1/") export RUBY_VERSION=$(ruby --version | sed -e "s/^ruby \(.\..\..\).*$/\1/")
fi fi
# NVM
[[ -s $HOME/.nvm/nvm.sh ]] && source $HOME/.nvm/nvm.sh
# SSH specific config. # SSH specific config.
if [ -n "$SSH_CLIENT" ]; then if [ -n "$SSH_CLIENT" ]; then
# show host only if this is an ssh session # show host only if this is an ssh session
ps1_host="\[\033[01;32m\]\h" ps1_host="\[\e[01;32m\]\h"
fi fi
USER_NAME="Holger Just" USER_NAME="Holger Just"
@ -83,9 +86,9 @@ fi
case `uname` in case `uname` in
Darwin) Darwin)
export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Home" export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Home"
if [ $(which mvim) ]; then if [ $(which mate) ]; then
export EDITOR="mvim" export EDITOR="mate"
export SVN_EDITOR="mvim -f +1" export SVN_EDITOR="mate -wl1"
fi fi
function fullscreen() { printf "\e[3;0;0;t\e[8;0;0t"; return 0; } function fullscreen() { printf "\e[3;0;0;t\e[8;0;0t"; return 0; }
alias ls='ls -G' alias ls='ls -G'
@ -113,6 +116,7 @@ case `uname` in
export PG_DATA=/usr/local/var/postgres export PG_DATA=/usr/local/var/postgres
gitx() { open -a GitX $@; } gitx() { open -a GitX $@; }
alias gx=gitx
pdfman() { man -t $1 | open -a /Applications/Skim.app -f; } pdfman() { man -t $1 | open -a /Applications/Skim.app -f; }
# Bash completion # Bash completion
@ -152,7 +156,7 @@ case `uname` in
*) echo "OS unknown to bashrc." ;; *) echo "OS unknown to bashrc." ;;
esac esac
# setting up editor # setting up editor if not yet done
[[ -z "$EDITOR" ]] && EDITOR="nano" [[ -z "$EDITOR" ]] && EDITOR="nano"
[[ -z "$SVN_EDITOR" ]] && SVN_EDITOR="$EDITOR" [[ -z "$SVN_EDITOR" ]] && SVN_EDITOR="$EDITOR"
git config --global --replace-all core.editor "$SVN_EDITOR" git config --global --replace-all core.editor "$SVN_EDITOR"
@ -163,8 +167,8 @@ case $USER in
hjust) ;; hjust) ;;
*) *)
case $UID in case $UID in
0) ps1_user="\[\033[01;31m\]\u" ;; 0) ps1_user="\[\e[01;31m\]\u" ;;
*) ps1_user="\[\033[01;32m\]\u" ;; *) ps1_user="\[\e[01;32m\]\u" ;;
esac esac
esac esac
@ -173,7 +177,7 @@ ps1_ruby='$(rvm-prompt)'
. $HOME/bin/bash_vcs.sh . $HOME/bin/bash_vcs.sh
ps1_vcs='$(__prompt_command)' ps1_vcs='$(__prompt_command)'
ps1_ruby=' \[\033[0;34m\]$(rvm-prompt v g)\[\033[00m\]' ps1_ruby=' \[\e[0;34m\]$(rvm-prompt v g)\[\e[00m\]'
#ps1_ruby="" #ps1_ruby=""
# set variable identifying the chroot you work in (used in the prompt below) # set variable identifying the chroot you work in (used in the prompt below)
@ -191,13 +195,13 @@ short_pwd() {
echo "$FIXED_PWD" echo "$FIXED_PWD"
fi fi
} }
ps1_pwd='\[\033[1;30m\]$(short_pwd)\[\033[00m\]' ps1_pwd='\[\e[1;30m\]$(short_pwd)\[\e[00m\]'
#ps1_pwd='\[\033[1;30m\]\W\[\033[00m\]' #ps1_pwd='\[\e[1;30m\]\W\[\e[00m\]'
# Building $PS1. # Building $PS1.
if [ -n "$ps1_user" ] && [ -n "$ps1_host" ]; then ps1_user="$ps1_user@"; fi if [ -n "$ps1_user" ] && [ -n "$ps1_host" ]; then ps1_user="$ps1_user@"; fi
PS1="$ps1_user$ps1_host" PS1="$ps1_user$ps1_host"
if [ "$PS1" != "" ]; then PS1="$PS1\[\033[00m\]:"; fi if [ "$PS1" != "" ]; then PS1="$PS1\[\e[00m\]:"; fi
export PS1="$PS1$ps1_pwd$ps1_vcs$ps1_ruby \$ " export PS1="$PS1$ps1_pwd$ps1_vcs$ps1_ruby \$ "
@ -206,7 +210,7 @@ export PS1="$PS1$ps1_pwd$ps1_vcs$ps1_ruby \$ "
# If this is an xterm set the title to user@host:dir. # If this is an xterm set the title to user@host:dir.
case "$TERM" in case "$TERM" in
xterm*|rxvt*) export PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME}: ${PWD/$HOME/~}\007"' ;; xterm*|rxvt*) export PROMPT_COMMAND='echo -ne "\e]0;${USER}@${HOSTNAME}: ${PWD/$HOME/~}\007"' ;;
*) ;; *) ;;
esac esac
@ -227,6 +231,7 @@ alias screen='screen -U'
alias use='rvm use' alias use='rvm use'
alias gems='gem list | less' alias gems='gem list | less'
alias less='less -R' alias less='less -R'
alias gsvn='git svn' alias gsvn='git svn'
alias gdiff='git diff' alias gdiff='git diff'
alias st='git st' alias st='git st'

2
.gitconfig
View File

@ -22,6 +22,6 @@
default = matching default = matching
[core] [core]
autocrlf = false autocrlf = false
editor = mvim -f +1 editor = mate -wl1
[github] [github]
user = meineerde user = meineerde