Skip to content

Commit

Permalink
Minor tweaks: added ability to have a local bashrc file per machine. …
Browse files Browse the repository at this point in the history
…Added style for over 120 char lines in vim. Misc
  • Loading branch information
Todd Werth committed Sep 4, 2009
1 parent 5fdd72a commit 85ae208
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 5 deletions.
4 changes: 4 additions & 0 deletions etc/bash_profile
Expand Up @@ -28,6 +28,10 @@ fi
# Load in .bashrc -------------------------------------------------
source ~/.bashrc

if [ -f ~/.bashrc_local ]; then
source ~/.bashrc_local
fi



# Hello Messsage --------------------------------------------------
Expand Down
7 changes: 4 additions & 3 deletions etc/bashrc
Expand Up @@ -41,7 +41,9 @@ export HISTCONTROL=ignoredups
export HISTFILESIZE=3000
export HISTIGNORE="ls:cd:[bf]g:exit:..:...:ll:lla"
alias h=history
alias hf='history | g'
hf(){
grep "$@" ~/.bash_history
}



Expand Down Expand Up @@ -71,8 +73,7 @@ source ~/cl/bin/git-completion.bash
#git status 2> /dev/null | grep -c : | awk '{if ($1 > 0) print "⚡"}'
#}

prompt_func()
{
prompt_func() {
previous_return_value=$?;
prompt="${COLOR_GREEN}\w${COLOR_GRAY}$(__git_ps1)${COLOR_NC}\[\033]0;\u@\h: \w\007\] "
#prompt="${COLOR_GREEN}\w${COLOR_NC}$(__git_ps1)${COLOR_YELLOW}$(git_dirty_flag)${COLOR_NC} "
Expand Down
3 changes: 1 addition & 2 deletions etc/irbrc
@@ -1,7 +1,6 @@
# Awesome IRB (mod'd) file from http://github.com/logankoester/irbrc
# Setup:
# sudo gem install wirble
# sudo gem install what_methods
# sudo gem install wirble what_methods

# Make gems available
require 'rubygems'
Expand Down
1 change: 1 addition & 0 deletions etc/vim/vimrc
Expand Up @@ -97,6 +97,7 @@ colorscheme ir_black
set showcmd
set ruler " Show ruler
"set ch=2 " Make command line two lines high
match CursorColumn '\%120v.*' " Show error format when a line is longer than 120 chars


" Line Wrapping ***************************************************************
Expand Down

0 comments on commit 85ae208

Please sign in to comment.