c5e6dbf76b92adfc9a21955a25b52a8f4065fa95

Message

Merge pull request #613 from rkj/master

Please merge my theme.

Diff

This diff is truncated to protect this page.

 1diff --git a/themes/rkj-repos.zsh-theme b/themes/rkj-repos.zsh-theme
 2new file mode 100644
 3index 0000000000000000000000000000000000000000..318c315bbbf9c3f2e3fecfbbe16b201b543e0ece
 4--- /dev/null
 5+++ b/themes/rkj-repos.zsh-theme
 6@@ -0,0 +1,29 @@
 7+# user, host, full path, and time/date
 8+# on two lines for easier vgrepping
 9+# entry in a nice long thread on the Arch Linux forums: http://bbs.archlinux.org/viewtopic.php?pid=521888#p521888
10+
11+function hg_prompt_info {
12+    hg prompt --angle-brackets "\
13+<hg:%{$fg[magenta]%}<branch>%{$reset_color%}>\
14+</%{$fg[yellow]%}<tags|%{$reset_color%}, %{$fg[yellow]%}>%{$reset_color%}>\
15+%{$fg[red]%}<status|modified|unknown><update>%{$reset_color%}<
16+patches: <patches|join( → )|pre_applied(%{$fg[yellow]%})|post_applied(%{$reset_color%})|pre_unapplied(%{$fg_bold[black]%})|post_unapplied(%{$reset_color%})>>" 2>/dev/null
17+}
18+
19+ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[cyan]%}+"
20+ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[yellow]%}✱"
21+ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%}✗"
22+ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[blue]%}➦"
23+ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[magenta]%}✂"
24+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[grey]%}✈"
25+
26+function mygit() {
27+  ref=$(git symbolic-ref HEAD 2> /dev/null) || return
28+  echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$( git_prompt_status )%{$reset_color%}$ZSH_THEME_GIT_PROMPT_SUFFIX"
29+}
30+
31+# alternate prompt with git & hg
32diff --git a/themes/rkj.zsh-theme b/themes/rkj.zsh-theme
33new file mode 100644
34index 0000000000000000000000000000000000000000..81b701e07d4a6b0a15577ae3dc6a2ae9a6846d52
35--- /dev/null
36+++ b/themes/rkj.zsh-theme
37@@ -0,0 +1,8 @@
38+# user, host, full path, and time/date
39+# on two lines for easier vgrepping
40+# entry in a nice long thread on the Arch Linux forums: http://bbs.archlinux.org/viewtopic.php?pid=521888#p521888
41+