From 259caecfa6263507c08afa6ba2819e31198c52b9 Mon Sep 17 00:00:00 2001 From: Rahul Trikha Date: Thu, 5 Feb 2015 11:13:58 +1030 Subject: [PATCH 1/3] Added lambda theme which includes rbenv helpers Characteristics - Working directory - Git branch and dirty state (if inside a git repo) - Rbenv Ruby Version - Rbenv Ruby Gemset --- themes/lambda/README.md | 12 ++++++++ themes/lambda/fish_prompt.fish | 40 +++++++++++++++++++++++++++ themes/lambda/fish_right_prompt.fish | 21 ++++++++++++++ themes/lambda/screenshot.png | Bin 0 -> 21070 bytes 4 files changed, 73 insertions(+) create mode 100644 themes/lambda/README.md create mode 100644 themes/lambda/fish_prompt.fish create mode 100644 themes/lambda/fish_right_prompt.fish create mode 100644 themes/lambda/screenshot.png diff --git a/themes/lambda/README.md b/themes/lambda/README.md new file mode 100644 index 0000000..21ba515 --- /dev/null +++ b/themes/lambda/README.md @@ -0,0 +1,12 @@ +## Lambda + +A theme inspired by [oh-my-zsh](https://github.com/robbyrussell/oh-my-zsh/blob/master/themes/lambda.zsh-theme)'s [lambda](http://zshthem.es/screenshots/lambda.png) theme. + +![](http://f.cl.ly/items/0s2B1n3F0I31340E273G/Screen%20Shot%202015-02-05%20at%2010.50.06%20am.png) + +#### Characteristics + +* Working directory +* Git branch and dirty state (if inside a git repo) +* Rbenv Ruby Version +* Rbenv Ruby Gemset diff --git a/themes/lambda/fish_prompt.fish b/themes/lambda/fish_prompt.fish new file mode 100644 index 0000000..d2d07f4 --- /dev/null +++ b/themes/lambda/fish_prompt.fish @@ -0,0 +1,40 @@ +# name: lambda +# --------------- +# Based on oh-my-zsh lambda theme +# +# Display the following bits on the left: +# - Working directory +# - Git branch and dirty state (if inside a git repo) +# +# Display the following bits on the right: +# - Rbenv Ruby Version +# - Rbenv Ruby Gemset# - Current directory name + +function _git_branch_name + echo (command git symbolic-ref HEAD ^/dev/null | sed -e 's|^refs/heads/||') +end + +function _is_git_dirty + echo (command git status -s --ignore-submodules=dirty ^/dev/null) +end + +function fish_prompt + set -l blue (set_color blue) + set -l green (set_color green) + set -l normal (set_color normal) + + set -l arrow "λ" + set -l cwd $blue(basename (prompt_pwd)) + + if [ (_git_branch_name) ] + set git_info $green(_git_branch_name) + set git_info ":$git_info" + + if [ (_is_git_dirty) ] + set -l dirty "*" + set git_info "$git_info$dirty" + end + end + + echo -n -s $cwd $git_info $normal ' ' $arrow ' ' +end diff --git a/themes/lambda/fish_right_prompt.fish b/themes/lambda/fish_right_prompt.fish new file mode 100644 index 0000000..79195fd --- /dev/null +++ b/themes/lambda/fish_right_prompt.fish @@ -0,0 +1,21 @@ +function _ruby_version + echo (command rbenv version-name | sed 's/\n//') +end + +function _ruby_gemset + echo (command rbenv gemset active ^/dev/null | sed -e 's| global||') +end + +function fish_right_prompt + set -l red (set_color red) + set -l normal (set_color normal) + + set ruby_info $red(_ruby_version) + + if [ (_ruby_gemset) ] + set -l ruby_gemset $red(_ruby_gemset) + set ruby_info "$ruby_info@$ruby_gemset" + end + + echo -n -s $ruby_info $normal +end diff --git a/themes/lambda/screenshot.png b/themes/lambda/screenshot.png new file mode 100644 index 0000000000000000000000000000000000000000..4261bf8558493f85d0cc91212151f75f5678b193 GIT binary patch literal 21070 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 bDV(|=m_Xs@uD|F^bMP4Ind%m6J4gN-LN^f? literal 0 HcmV?d00001 From 6ae22a5950192257794eb98c1e10395ca36f790d Mon Sep 17 00:00:00 2001 From: Rahul Trikha Date: Fri, 20 Feb 2015 11:04:14 +1030 Subject: [PATCH 2/3] Merged lambda theme into l Added a set fish_theme_l_right_prompt true variable to activate the right_prompt for l --- themes/l/fish_right_prompt.fish | 28 +++++++++++++++++++ themes/l/readme.md | 14 ++++++++-- themes/lambda/README.md | 12 -------- themes/lambda/fish_prompt.fish | 40 --------------------------- themes/lambda/fish_right_prompt.fish | 21 -------------- themes/lambda/screenshot.png | Bin 21070 -> 0 bytes 6 files changed, 40 insertions(+), 75 deletions(-) create mode 100644 themes/l/fish_right_prompt.fish delete mode 100644 themes/lambda/README.md delete mode 100644 themes/lambda/fish_prompt.fish delete mode 100644 themes/lambda/fish_right_prompt.fish delete mode 100644 themes/lambda/screenshot.png diff --git a/themes/l/fish_right_prompt.fish b/themes/l/fish_right_prompt.fish new file mode 100644 index 0000000..68eb155 --- /dev/null +++ b/themes/l/fish_right_prompt.fish @@ -0,0 +1,28 @@ +# To show the right prompt please set +# set fish_theme_l_right_prompt true (config.fish) + +if test "$fish_theme_l_right_prompt" = true + + function _ruby_version + echo (command rbenv version-name | sed 's/\n//') + end + + function _ruby_gemset + echo (command rbenv gemset active ^/dev/null | sed -e 's| global||') + end + + function fish_right_prompt + set -l red (set_color red) + set -l normal (set_color normal) + + set ruby_info $red(_ruby_version) + + if [ (_ruby_gemset) ] + set -l ruby_gemset $red(_ruby_gemset) + set ruby_info "$ruby_info@$ruby_gemset" + end + + echo -n -s $ruby_info $normal + end + +end diff --git a/themes/l/readme.md b/themes/l/readme.md index c1d9ad0..a5239f4 100644 --- a/themes/l/readme.md +++ b/themes/l/readme.md @@ -6,9 +6,19 @@ A theme inspired by [oh-my-zsh](https://github.com/robbyrussell/oh-my-zsh/blob/m ![](http://f.cl.ly/items/2S25360U1p360E0D2u2g/3.png) ![](http://f.cl.ly/items/1w0s0Q3x3r2Z1F1l011k/4.png) - #### Characteristics * Current branch * Dirty working directory -* Working directory \ No newline at end of file +* Working directory + +Only if fish_theme_l_right_prompt variable is set true within config.fish + +```fish +set fish_theme_l_right_prompt true +``` + +* Rbenv Ruby Version +* Rbenv Ruby Gemset + +![](http://f.cl.ly/items/0f0k3o2L3y2q1L3g1R1X/5.png) diff --git a/themes/lambda/README.md b/themes/lambda/README.md deleted file mode 100644 index 21ba515..0000000 --- a/themes/lambda/README.md +++ /dev/null @@ -1,12 +0,0 @@ -## Lambda - -A theme inspired by [oh-my-zsh](https://github.com/robbyrussell/oh-my-zsh/blob/master/themes/lambda.zsh-theme)'s [lambda](http://zshthem.es/screenshots/lambda.png) theme. - -![](http://f.cl.ly/items/0s2B1n3F0I31340E273G/Screen%20Shot%202015-02-05%20at%2010.50.06%20am.png) - -#### Characteristics - -* Working directory -* Git branch and dirty state (if inside a git repo) -* Rbenv Ruby Version -* Rbenv Ruby Gemset diff --git a/themes/lambda/fish_prompt.fish b/themes/lambda/fish_prompt.fish deleted file mode 100644 index d2d07f4..0000000 --- a/themes/lambda/fish_prompt.fish +++ /dev/null @@ -1,40 +0,0 @@ -# name: lambda -# --------------- -# Based on oh-my-zsh lambda theme -# -# Display the following bits on the left: -# - Working directory -# - Git branch and dirty state (if inside a git repo) -# -# Display the following bits on the right: -# - Rbenv Ruby Version -# - Rbenv Ruby Gemset# - Current directory name - -function _git_branch_name - echo (command git symbolic-ref HEAD ^/dev/null | sed -e 's|^refs/heads/||') -end - -function _is_git_dirty - echo (command git status -s --ignore-submodules=dirty ^/dev/null) -end - -function fish_prompt - set -l blue (set_color blue) - set -l green (set_color green) - set -l normal (set_color normal) - - set -l arrow "λ" - set -l cwd $blue(basename (prompt_pwd)) - - if [ (_git_branch_name) ] - set git_info $green(_git_branch_name) - set git_info ":$git_info" - - if [ (_is_git_dirty) ] - set -l dirty "*" - set git_info "$git_info$dirty" - end - end - - echo -n -s $cwd $git_info $normal ' ' $arrow ' ' -end diff --git a/themes/lambda/fish_right_prompt.fish b/themes/lambda/fish_right_prompt.fish deleted file mode 100644 index 79195fd..0000000 --- a/themes/lambda/fish_right_prompt.fish +++ /dev/null @@ -1,21 +0,0 @@ -function _ruby_version - echo (command rbenv version-name | sed 's/\n//') -end - -function _ruby_gemset - echo (command rbenv gemset active ^/dev/null | sed -e 's| global||') -end - -function fish_right_prompt - set -l red (set_color red) - set -l normal (set_color normal) - - set ruby_info $red(_ruby_version) - - if [ (_ruby_gemset) ] - set -l ruby_gemset $red(_ruby_gemset) - set ruby_info "$ruby_info@$ruby_gemset" - end - - echo -n -s $ruby_info $normal -end diff --git a/themes/lambda/screenshot.png b/themes/lambda/screenshot.png deleted file mode 100644 index 4261bf8558493f85d0cc91212151f75f5678b193..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21070 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 bDV(|=m_Xs@uD|F^bMP4Ind%m6J4gN-LN^f? From 7154875cf020ef7abc765b936df7131e9dad0259 Mon Sep 17 00:00:00 2001 From: Rahul Trikha Date: Tue, 10 Mar 2015 23:57:51 +1030 Subject: [PATCH 3/3] Updated l theme to have rbenv support --- themes/l/fish_right_prompt.fish | 29 +++++++++++++++-------------- themes/l/readme.md | 3 ++- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/themes/l/fish_right_prompt.fish b/themes/l/fish_right_prompt.fish index 68eb155..ced537a 100644 --- a/themes/l/fish_right_prompt.fish +++ b/themes/l/fish_right_prompt.fish @@ -1,28 +1,29 @@ # To show the right prompt please set -# set fish_theme_l_right_prompt true (config.fish) +# set theme_display_rbenv 'yes' (config.fish) +# set theme_display_rbenv_gemset 'yes' (config.fish) -if test "$fish_theme_l_right_prompt" = true +function _ruby_version + echo (command rbenv version-name | sed 's/\n//') +end - function _ruby_version - echo (command rbenv version-name | sed 's/\n//') - end +function _ruby_gemset + echo (command rbenv gemset active ^/dev/null | sed -e 's| global||') +end - function _ruby_gemset - echo (command rbenv gemset active ^/dev/null | sed -e 's| global||') - end - - function fish_right_prompt +function fish_right_prompt + if [ "$theme_display_rbenv" = 'yes' ] set -l red (set_color red) set -l normal (set_color normal) set ruby_info $red(_ruby_version) - if [ (_ruby_gemset) ] - set -l ruby_gemset $red(_ruby_gemset) - set ruby_info "$ruby_info@$ruby_gemset" + if [ "$theme_display_rbenv_gemset" = 'yes' ] + if [ (_ruby_gemset) ] + set -l ruby_gemset $red(_ruby_gemset) + set ruby_info "$ruby_info@$ruby_gemset" + end end echo -n -s $ruby_info $normal end - end diff --git a/themes/l/readme.md b/themes/l/readme.md index a5239f4..b181660 100644 --- a/themes/l/readme.md +++ b/themes/l/readme.md @@ -15,7 +15,8 @@ A theme inspired by [oh-my-zsh](https://github.com/robbyrussell/oh-my-zsh/blob/m Only if fish_theme_l_right_prompt variable is set true within config.fish ```fish -set fish_theme_l_right_prompt true +set theme_display_rbenv 'yes' +set theme_display_rbenv_gemset 'yes' ``` * Rbenv Ruby Version