Merge pull request #377 from amio/edan-update

Improve Edan theme design & function naming.

themes/edan/README.md

@@ -2,13 +2,13 @@
 
 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/5837282/b02c0e5c-a1b8-11e4-914f-f4f05e99880a.png)
+![Screenshot of theme Edan](https://cloud.githubusercontent.com/assets/215282/6199938/f67e6a54-b49a-11e4-800b-587a638cfb86.png)
 
 #### Characteristics
 
 ##### Left Prompt
 
-* User & host (hidden by default, execute `edan-remote` to show, `edan-local` to hide)
+* 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)
@@ -17,3 +17,7 @@ Inspired by idan, a functional, uncluttered fish theme with usability perks for
 
 * Full CWD path
 * Last error code (if applicable)
+
+#### Font
+
+Check out [Anonymous Pro](http://www.marksimonson.com/fonts/view/anonymous-pro).

themes/edan/edan-local.fish → themes/edan/edan-set-local.fish

 # Switch environment to "local" for edan.
 
-function edan-local
+function edan-set-local
   set -U EDAN_HOST_TYPE "local"
 end

themes/edan/edan-remote.fish → themes/edan/edan-set-remote.fish

 # Switch environment to "remote" for edan.
 
-function edan-remote
+function edan-set-remote
   set -U EDAN_HOST_TYPE 'remote'
 end

themes/edan/fish_prompt.fish

@@ -19,7 +19,7 @@ function _user_host
   else
     echo -n (set_color -o blue)
   end
-  echo -n $USER°(hostname|cut -d . -f 1) (set color normal)
+  echo -n (hostname|cut -d . -f 1)ˇ$USER (set color normal)
 end
 
 function fish_prompt
@@ -57,7 +57,7 @@ function fish_prompt
     set -l git_branch '[' (_git_branch_name) ']'
 
     if [ (_is_git_dirty) ]
-      set git_info $red $git_branch " ★"
+      set git_info $red $git_branch "×"
     else
       set git_info $green $git_branch
     end