From 983057126f59860f117188ab0e95efb5d4836823 Mon Sep 17 00:00:00 2001 From: Justin Hileman Date: Sun, 31 May 2015 08:30:50 -0700 Subject: [PATCH] [split] Move edan theme to oh-my-fish/theme-edan https://github.com/oh-my-fish/theme-edan --- themes/edan/README.md | 23 ---------- themes/edan/edan-set-local.fish | 5 --- themes/edan/edan-set-remote.fish | 5 --- themes/edan/fish_prompt.fish | 70 ------------------------------ themes/edan/fish_right_prompt.fish | 17 -------- 5 files changed, 120 deletions(-) delete mode 100644 themes/edan/README.md delete mode 100644 themes/edan/edan-set-local.fish delete mode 100644 themes/edan/edan-set-remote.fish delete mode 100644 themes/edan/fish_prompt.fish delete mode 100644 themes/edan/fish_right_prompt.fish diff --git a/themes/edan/README.md b/themes/edan/README.md deleted file mode 100644 index 319d361..0000000 --- a/themes/edan/README.md +++ /dev/null @@ -1,23 +0,0 @@ -## Theme Edan - -Inspired by idan, a functional, uncluttered fish theme with usability perks for git users and python developers. - -![Screenshot of theme Edan](https://cloud.githubusercontent.com/assets/215282/6199938/f67e6a54-b49a-11e4-800b-587a638cfb86.png) - -#### Characteristics - -##### Left Prompt - -* User & host (Shown in "remote" mode, hidden by default. Execute `edan-set-remote` or `edan-set-local` to switch.) -* Current python virtualenv (if applicable) -* Truncated CWD (just the current folder name) -* Git branch and dirty state (if applicable) - -##### Right Prompt - -* Full CWD path -* Last error code (if applicable) - -#### Font - -Check out [Anonymous Pro](http://www.marksimonson.com/fonts/view/anonymous-pro). diff --git a/themes/edan/edan-set-local.fish b/themes/edan/edan-set-local.fish deleted file mode 100644 index 38bb453..0000000 --- a/themes/edan/edan-set-local.fish +++ /dev/null @@ -1,5 +0,0 @@ -# Switch environment to "local" for edan. - -function edan-set-local - set -U EDAN_HOST_TYPE "local" -end diff --git a/themes/edan/edan-set-remote.fish b/themes/edan/edan-set-remote.fish deleted file mode 100644 index 1ffcd27..0000000 --- a/themes/edan/edan-set-remote.fish +++ /dev/null @@ -1,5 +0,0 @@ -# Switch environment to "remote" for edan. - -function edan-set-remote - set -U EDAN_HOST_TYPE 'remote' -end diff --git a/themes/edan/fish_prompt.fish b/themes/edan/fish_prompt.fish deleted file mode 100644 index acff1e6..0000000 --- a/themes/edan/fish_prompt.fish +++ /dev/null @@ -1,70 +0,0 @@ -# fish theme: edan -# Display the following bits on the left: -# * User & host (hidden by default, execute `edan-remote`to show, `edan-local` to hide) -# * Virtualenv name (if applicable, see https://github.com/adambrenecki/virtualfish) -# * Current directory name -# * Git branch and dirty state (if inside a git repo) - -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 _user_host - if [ (id -u) = "0" ]; - echo -n (set_color -o red) - else - echo -n (set_color -o blue) - end - echo -n (hostname|cut -d . -f 1)ˇ$USER (set color normal) -end - -function fish_prompt - set fish_greeting - set -l cyan (set_color -o cyan) - set -l yellow (set_color -o yellow) - set -l red (set_color -o red) - set -l blue (set_color -o blue) - set -l green (set_color -o green) - set -l normal (set_color normal) - - set -l cwd $cyan(basename (prompt_pwd)) - - # output the prompt, left to right - - # Add a newline before prompts - echo -e "" - - # Display [venvname] if in a virtualenv - if set -q VIRTUAL_ENV - echo -n -s (set_color -b cyan black) '[' (basename "$VIRTUAL_ENV") ']' $normal ' ' - end - - # Display [user & host] when on remote host - if [ "$EDAN_HOST_TYPE" = "remote" ] - _user_host; echo -n ': ' - end - - # Display the current directory name - echo -n -s $cwd $normal - - - # Show git branch and dirty state - if [ (_git_branch_name) ] - set -l git_branch '[' (_git_branch_name) ']' - - if [ (_is_git_dirty) ] - set git_info $red $git_branch "×" - else - set git_info $green $git_branch - end - echo -n -s ' ' $git_info $normal - end - - # Terminate with a nice prompt char - echo -n -s ' » ' $normal - -end diff --git a/themes/edan/fish_right_prompt.fish b/themes/edan/fish_right_prompt.fish deleted file mode 100644 index 6d693dd..0000000 --- a/themes/edan/fish_right_prompt.fish +++ /dev/null @@ -1,17 +0,0 @@ -# Display the compressed current working path on the right -# If the previous command returned any kind of error code, display that too - -function fish_right_prompt - set -l last_status $status - set -l cyan (set_color -o cyan) - set -l red (set_color -o red) - set -l normal (set_color normal) - - echo -n -s $cyan (prompt_pwd) - - if test $last_status -ne 0 - set_color red - printf ' %d' $last_status - set_color normal - end -end