Merge pull request #160 from bobthecow/master

Minor updates for bobthefish
This commit is contained in:
Bruno 2014-05-14 14:00:14 -03:00
commit 376ae33831
4 changed files with 29 additions and 8 deletions

21
themes/bobthefish/LICENSE Normal file
View File

@ -0,0 +1,21 @@
The MIT License (MIT)
Copyright (c) 2013-2014 Justin Hileman
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
OR OTHER DEALINGS IN THE SOFTWARE.

View File

@ -1,4 +1,4 @@
function fish_greeting
function fish_greeting -d "what's up, fish?"
set_color $fish_color_autosuggestion[1]
uname -npsr
uptime

View File

@ -54,11 +54,11 @@ set lt_grey ccc
# Helper methods
# ===========================
function __bobthefish_in_git
function __bobthefish_in_git -d 'Check whether pwd is inside a git repo'
command git rev-parse --is-inside-work-tree >/dev/null 2>&1
end
function __bobthefish_git_branch
function __bobthefish_git_branch -d 'Get the current git branch (or commitish)'
set -l ref (command git symbolic-ref HEAD 2> /dev/null)
if [ $status -gt 0 ]
set -l branch (command git show-ref --head -s --abbrev |head -n1 2> /dev/null)
@ -85,7 +85,7 @@ end
# Segment functions
# ===========================
function __bobthefish_start_segment -d 'Start a segment'
function __bobthefish_start_segment -d 'Start a prompt segment'
set_color -b $argv[1]
set_color $argv[2]
if [ "$current_bg" = 'NONE' ]
@ -133,7 +133,7 @@ function __bobthefish_path_segment -d 'Display a shortened form of a directory'
set_color normal
end
function __bobthefish_finish_segments -d 'Close open segments'
function __bobthefish_finish_segments -d 'Close open prompt segments'
if [ -n $current_bg -a $current_bg != 'NONE' ]
set_color -b normal
set_color $current_bg
@ -148,7 +148,7 @@ end
# Theme components
# ===========================
function __bobthefish_prompt_status -d 'the symbols for a non zero exit status, root and background jobs'
function __bobthefish_prompt_status -d 'Display symbols for a non zero exit status, root and background jobs'
set -l nonzero
set -l superuser
set -l bg_jobs
@ -252,7 +252,7 @@ end
# Apply theme
# ===========================
function fish_prompt
function fish_prompt -d 'bobthefish, a fish theme optimized for awesome'
set -g RETVAL $status
__bobthefish_prompt_status
__bobthefish_prompt_user

View File

@ -1,4 +1,4 @@
function fish_right_prompt
function fish_right_prompt -d 'bobthefish is all about the right prompt'
set_color $fish_color_autosuggestion[1]
date
set_color normal