.gitmodules fish/bin/edit_gem fish/bin/gem_doc fish/bin/parse_db_yml fish/completions/cap.fish fish/completions/cdgem.fish fish/completions/createdb.fish fish/completions/cucumber.fish fish/completions/dropdb.fish fish/completions/edit_gem.fish fish/completions/gem_doc.fish fish/completions/git-svn.fish fish/completions/git.fish fish/completions/pg_dump.fish fish/completions/psql.fish fish/completions/rake.fish fish/completions/rcd.fish fish/completions/rmate.fish fish/functions/__completion_cache_path.fish fish/functions/__db_list.fish fish/functions/__db_list_pg.fish fish/functions/__db_list_web.fish fish/functions/__detect_webapp.fish fish/functions/__sinatra_app.fish fish/functions/c.fish fish/functions/cdgem.fish fish/functions/clean_rake_cache.fish fish/functions/fish_title.fish fish/functions/git_dirty.fish fish/functions/mysqlbackup.fish fish/functions/netpid.fish fish/functions/rcd.fish fish/functions/rdir.fish fish/functions/rmate.fish fish/functions/s.fish fish/functions/save.fish fish/functions/sc.fish fish/functions/ss.fish fish/functions/sshkey.fish @@ -1,2 +1,3 @@ fish/fish_history +fish/fish_read_history fish/fishd.* \ No newline at end of file .gitignore @@ -1,5 +1,5 @@ alias gem='sudo gem' # sick of always forgetting sudo -alias ls='ls -G' +alias ls='ls -FG' alias ll='ls -lah' alias ..='cd ..;' # can then do .. .. .. to move up multiple directories. alias ...='.. ..' aliases @@ -1 +1,22 @@ -set -x PATH $PATH /usr/local/git/bin /usr/local/mysql/bin +mkdir -p ~/.l + +set fish_greeting '' +set -x PWD "~" # some reason this is empty in new consoles + +set -x PATH $PATH /usr/local/git/bin /usr/local/mysql/bin /usr/local/jruby/bin +set -x CDPATH . ~ ~/Sites ~/Code /Volumes ~/.l + +set -x EDITOR "mate -w" +set -x VISUAL $EDITOR +set -x GITEDITOR $EDITOR + +set -x CLICOLOR 1 +set -x JAVA_HOME "/usr/" +set -U BROWSER "open -a Safari" + + +bind \cr "rake" + +set fish_color_git_branch green +set fish_color_cwd blue +set fish_color_uneditable_cwd red \ No newline at end of file fish/config.fish @@ -1,10 +1,29 @@ -function fish_prompt --description 'Write out the prompt' - set pr_timestamp (date '+%a %H:%M:%S') - set pr_user (whoami) - set pr_host (hostname | cut -d . -f 1) - set pr_cwd (prompt_pwd) - set pr_git_info (git_cwd_info) - echo -e "\033[90m$pr_timestamp\033[0m $pr_user\033[90m@\033[0m$pr_host \033[90m$pr_cwd$pr_git_info\033[0m \033[32m>\033[0m " - +# function fish_prompt --description 'Write out the prompt' +# set pr_timestamp (date '+%a %H:%M:%S') +# set pr_user (whoami) +# set pr_host (hostname | cut -d . -f 1) +# set pr_cwd (prompt_pwd) +# set pr_git_info (git_cwd_info) +# printf "\033[90m$pr_timestamp\033[0m $pr_user\033[90m@\033[0m$pr_host \033[90m$pr_cwd\033[0m \033[32m>\033[0m " +# end -end +function fish_prompt --description 'Write out the prompt' + printf '%s%s@%s%s ' (set_color green) (whoami) (hostname|cut -d . -f 1) (set_color normal) + + # Write the process working directory + if test -w "." + printf '%s%s ' (set_color -o $fish_color_cwd) (prompt_pwd) + else + printf '%s%s ' (set_color -o $fish_color_uneditable_cwd) (prompt_pwd) + end + + printf '%s%s ' (set_color $fish_color_git_branch) (git_parse_branch) + + if git_dirty + printf '%s☠ ' (set_color red) + end + + printf '%s$%s ' (set_color -o $fish_color_cwd) (set_color normal) + + printf '%s> ' (set_color normal) +end \ No newline at end of file fish/functions/fish_prompt.fish @@ -7,7 +7,4 @@ function git_cwd_info printf "%s" (git_dirty_files_count) end end - - - end fish/functions/git_cwd_info.fish @@ -1,5 +1,3 @@ function git_parse_branch sh -c 'git branch --no-color 2> /dev/null' | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/' - - end fish/functions/git_parse_branch.fish fish/functions/parse_git_branch.fish 5e5b0058c9516a44c7c415c2c4c7c80ad87a3c28 Bodaniel Jeanes me@bjeanes.com http://github.com/bjeanes/dot-files/commit/e22ad2730f4a99997dd75aae821b1640c481e0eb e22ad2730f4a99997dd75aae821b1640c481e0eb 2009-06-10T16:54:54-07:00 2009-06-10T16:54:54-07:00 Added stuff from fish-nuggets and changed behaviour of a few 138d4e19f89c54afb30ba36f5ef82663adb8d5d2 Bodaniel Jeanes me@bjeanes.com