From ce82e6ff7a9de163d0719e600ae2ffd52fc563f0 Mon Sep 17 00:00:00 2001
From: Toon Claes <toon@tonotdo.com>
Date: Thu, 29 Oct 2009 23:18:19 +0100
Subject: [PATCH 1/7] Added my theme

---
 themes/tonotdo.zsh-theme | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 themes/tonotdo.zsh-theme

diff --git a/themes/tonotdo.zsh-theme b/themes/tonotdo.zsh-theme
new file mode 100644
index 0000000..6e864f5
--- /dev/null
+++ b/themes/tonotdo.zsh-theme
@@ -0,0 +1,7 @@
+# Inspired by many other themes
+PROMPT='[%*] %{$fg[cyan]%}%n%{$fg[magenta]%}➜%{$fg[green]%}%3~$(git_prompt_info)%{$reset_color%} » '
+
+ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg_bold[blue]%}git(%{$fg[red]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX=""
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[yellow]%}✗%{$fg[blue]%})"

From ea57faa28a124c6306e030c57dc9f1963a5753a3 Mon Sep 17 00:00:00 2001
From: Toon Claes <toon@tonotdo.com>
Date: Fri, 30 Oct 2009 18:15:45 +0100
Subject: [PATCH 2/7] Small fix, probably the smallest possible

---
 themes/tonotdo.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/tonotdo.zsh-theme b/themes/tonotdo.zsh-theme
index 6e864f5..1562b72 100644
--- a/themes/tonotdo.zsh-theme
+++ b/themes/tonotdo.zsh-theme
@@ -1,5 +1,5 @@
 # Inspired by many other themes
-PROMPT='[%*] %{$fg[cyan]%}%n%{$fg[magenta]%}➜%{$fg[green]%}%3~$(git_prompt_info)%{$reset_color%} » '
+PROMPT='[%*] %{$fg[cyan]%}%n%{$fg[magenta]%}➜%{$fg[green]%}%3~$(git_prompt_info)%{$reset_color%}» '
 
 ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg_bold[blue]%}git(%{$fg[red]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX=""

From cef9b42a3a94c1a12d6587850eaa798edffe32ba Mon Sep 17 00:00:00 2001
From: Toon Claes <toon@tonotdo.com>
Date: Fri, 30 Oct 2009 20:41:38 +0100
Subject: [PATCH 3/7] Skip the git word in this theme

---
 themes/tonotdo.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/tonotdo.zsh-theme b/themes/tonotdo.zsh-theme
index 1562b72..dca6516 100644
--- a/themes/tonotdo.zsh-theme
+++ b/themes/tonotdo.zsh-theme
@@ -1,7 +1,7 @@
 # Inspired by many other themes
 PROMPT='[%*] %{$fg[cyan]%}%n%{$fg[magenta]%}➜%{$fg[green]%}%3~$(git_prompt_info)%{$reset_color%}» '
 
-ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg_bold[blue]%}git(%{$fg[red]%}"
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}(%{$fg[red]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX=""
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})"
 ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[yellow]%}✗%{$fg[blue]%})"

From 2ed5139bd6cc1cec900bdaa33671519e0e9e4a10 Mon Sep 17 00:00:00 2001
From: Toon Claes <toon@tonotdo.com>
Date: Wed, 4 Nov 2009 20:37:18 +0100
Subject: [PATCH 4/7] Joined the appearance so the theme can apply LSCOLORS too

---
 lib/aliases.zsh    |  2 +-
 lib/appearance.zsh | 34 ++++++++++++++++++++++++++++++++++
 lib/colors.zsh     |  4 ----
 lib/git.zsh        | 11 -----------
 lib/misc.zsh       |  4 ++++
 lib/prompt.zsh     | 25 -------------------------
 6 files changed, 39 insertions(+), 41 deletions(-)
 create mode 100644 lib/appearance.zsh
 delete mode 100644 lib/colors.zsh
 delete mode 100644 lib/prompt.zsh

diff --git a/lib/aliases.zsh b/lib/aliases.zsh
index 6667a67..c3a6cf0 100644
--- a/lib/aliases.zsh
+++ b/lib/aliases.zsh
@@ -45,7 +45,7 @@ alias gcp='git cherry-pick'
 alias history='fc -l 1'
 
 # List direcory contents
-alias ls='ls -F'
+alias ls='ls -F -G'
 alias lsa='ls -lahG'
 alias l='ls -la'
 alias ll='ls -alr'
diff --git a/lib/appearance.zsh b/lib/appearance.zsh
new file mode 100644
index 0000000..b1f5a8a
--- /dev/null
+++ b/lib/appearance.zsh
@@ -0,0 +1,34 @@
+# Colors
+autoload colors; colors;
+export LSCOLORS="Gxfxcxdxbxegedabagacad"
+
+#setopt no_beep
+setopt auto_cd
+setopt multios
+setopt cdablevarS
+
+if [[ x$WINDOW != x ]]
+then
+    SCREEN_NO="%B$WINDOW%b "
+else
+    SCREEN_NO=""
+fi
+
+# Apply theming defaults
+PS1="%n@%m:%~%# "
+
+# git theming default: Variables for theming the git info prompt
+# ZSH_THEME_GIT_PROMPT_PREFIX - Prefix at the very beginning of the prompt, before the branch name
+ZSH_THEME_GIT_PROMPT_PREFIX="git:("
+# ZSH_THEME_GIT_PROMPT_SUFFIX - At the very end of the prompt
+ZSH_THEME_GIT_PROMPT_SUFFIX=")"
+# ZSH_THEME_GIT_PROMPT_DIRTY  - Text to display if the branch is dirty
+ZSH_THEME_GIT_PROMPT_DIRTY="*"
+# ZSH_THEME_GIT_PROMPT_CLEAN  - Text to display if the branch is clean
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+
+# Setup the prompt with pretty colors
+setopt prompt_subst
+
+# Load the theme
+source "$ZSH/themes/$ZSH_THEME.zsh-theme"
\ No newline at end of file
diff --git a/lib/colors.zsh b/lib/colors.zsh
deleted file mode 100644
index b2b08f9..0000000
--- a/lib/colors.zsh
+++ /dev/null
@@ -1,4 +0,0 @@
-autoload colors; colors;
-
-unset LSCOLORS
-export LS_COLORS='di=34:ln=35:so=32:pi=33:ex=31:bd=46;34:cd=43;34:su=41;30:sg=46;30:tw=42;30:ow=43;30'
diff --git a/lib/git.zsh b/lib/git.zsh
index 9409c92..84a3af0 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -1,14 +1,3 @@
-# Varables for themeing the git info prompt:
-# ZSH_THEME_GIT_PROMPT_PREFIX - Prefix at the very beginning of the prompt, before the branch name
-# ZSH_THEME_GIT_PROMPT_SUFFIX - At the very end of the prompt
-# ZSH_THEME_GIT_PROMPT_DIRTY  - Text to display if the branch is dirty
-# ZSH_THEME_GIT_PROMPT_CLEAN  - Text to display if the branch is clean
-
-ZSH_THEME_GIT_PROMPT_PREFIX="git:("
-ZSH_THEME_GIT_PROMPT_SUFFIX=")"
-ZSH_THEME_GIT_PROMPT_DIRTY="*"
-ZSH_THEME_GIT_PROMPT_CLEAN=""
-
 # get the name of the branch we are on
 function git_prompt_info() {
   ref=$(git symbolic-ref HEAD 2> /dev/null) || return
diff --git a/lib/misc.zsh b/lib/misc.zsh
index a01627d..4c17436 100644
--- a/lib/misc.zsh
+++ b/lib/misc.zsh
@@ -7,3 +7,7 @@ bindkey "^[m" copy-prev-shell-word
 
 ## jobs
 setopt long_list_jobs
+
+## pager
+export PAGER=less
+export LC_CTYPE=en_US.UTF-8
diff --git a/lib/prompt.zsh b/lib/prompt.zsh
deleted file mode 100644
index 3968968..0000000
--- a/lib/prompt.zsh
+++ /dev/null
@@ -1,25 +0,0 @@
-export PAGER=less
-export LC_CTYPE=en_US.UTF-8
-
-# speed stuff.
-
-#setopt no_beep
-setopt auto_cd
-setopt multios
-setopt cdablevarS
-
-if [[ x$WINDOW != x ]]
-then
-    SCREEN_NO="%B$WINDOW%b "
-else
-    SCREEN_NO=""
-fi
-
-PS1="%n@%m:%~%# "
-
-# Setup the prompt with pretty colors
-setopt prompt_subst
-
-export LSCOLORS="Gxfxcxdxbxegedabagacad"
-
-source "$ZSH/themes/$ZSH_THEME.zsh-theme"

From a65ec360cf00a2872e5a3f23e3c7523abd71c1dc Mon Sep 17 00:00:00 2001
From: Toon Claes <toon@tonotdo.com>
Date: Thu, 5 Nov 2009 20:30:53 +0100
Subject: [PATCH 5/7] added LSCOLORS

---
 themes/tonotdo.zsh-theme | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/themes/tonotdo.zsh-theme b/themes/tonotdo.zsh-theme
index dca6516..f1e9a28 100644
--- a/themes/tonotdo.zsh-theme
+++ b/themes/tonotdo.zsh-theme
@@ -1,7 +1,12 @@
 # Inspired by many other themes
-PROMPT='[%*] %{$fg[cyan]%}%n%{$fg[magenta]%}➜%{$fg[green]%}%3~$(git_prompt_info)%{$reset_color%}» '
+PROMPT='[%*] %{$fg[cyan]%}%n%{$fg[magenta]%}➜%{$fg[green]%}%3~%{$(git_prompt_info)%}%{$reset_color%}» '
 
+# git theming
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}(%{$fg[red]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX=""
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})"
 ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[yellow]%}✗%{$fg[blue]%})"
+
+# LS colors, made with http://geoff.greer.fm/lscolors/
+export LSCOLORS="Gxfxcxdxbxegedabagacad"
+export LS_COLORS="di=1;;40:ln=35;40:so=32;40:pi=33;40:ex=31;40:bd=34;46:cd=34;43:su=0;41:sg=0;46:tw=0;42:ow=0;43:"

From 600efef0c3428f05c7339e67496b75280146adba Mon Sep 17 00:00:00 2001
From: Toon Claes <toon@tonotdo.com>
Date: Thu, 5 Nov 2009 20:44:28 +0100
Subject: [PATCH 6/7] Enabled colors in ls and made it possible to theme them

---
 lib/aliases.zsh              |  3 +--
 lib/appearance.zsh           | 21 ++++++++++++---------
 templates/zshrc.zsh-template |  5 ++++-
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/lib/aliases.zsh b/lib/aliases.zsh
index c3a6cf0..88d68e1 100644
--- a/lib/aliases.zsh
+++ b/lib/aliases.zsh
@@ -45,8 +45,7 @@ alias gcp='git cherry-pick'
 alias history='fc -l 1'
 
 # List direcory contents
-alias ls='ls -F -G'
-alias lsa='ls -lahG'
+alias lsa='ls -lah'
 alias l='ls -la'
 alias ll='ls -alr'
 alias sl=ls # often screw this up
diff --git a/lib/appearance.zsh b/lib/appearance.zsh
index b1f5a8a..c9bd25d 100644
--- a/lib/appearance.zsh
+++ b/lib/appearance.zsh
@@ -1,6 +1,13 @@
-# Colors
+# ls colors
 autoload colors; colors;
 export LSCOLORS="Gxfxcxdxbxegedabagacad"
+#export LS_COLORS
+
+# Enable ls colors
+if [ "$DISABLE_LS_COLORS" != "true" ] then
+  # Find the option for using colors in ls, depending on the version: Linux or BSD
+  ls --color -d . &>/dev/null 2>&1 && alias ls='ls --color=tty' || alias ls='ls -G'
+fi
 
 #setopt no_beep
 setopt auto_cd
@@ -18,14 +25,10 @@ fi
 PS1="%n@%m:%~%# "
 
 # git theming default: Variables for theming the git info prompt
-# ZSH_THEME_GIT_PROMPT_PREFIX - Prefix at the very beginning of the prompt, before the branch name
-ZSH_THEME_GIT_PROMPT_PREFIX="git:("
-# ZSH_THEME_GIT_PROMPT_SUFFIX - At the very end of the prompt
-ZSH_THEME_GIT_PROMPT_SUFFIX=")"
-# ZSH_THEME_GIT_PROMPT_DIRTY  - Text to display if the branch is dirty
-ZSH_THEME_GIT_PROMPT_DIRTY="*"
-# ZSH_THEME_GIT_PROMPT_CLEAN  - Text to display if the branch is clean
-ZSH_THEME_GIT_PROMPT_CLEAN=""
+ZSH_THEME_GIT_PROMPT_PREFIX="git:("         # Prefix at the very beginning of the prompt, before the branch name
+ZSH_THEME_GIT_PROMPT_SUFFIX=")"             # At the very end of the prompt
+ZSH_THEME_GIT_PROMPT_DIRTY="*"              # Text to display if the branch is dirty
+ZSH_THEME_GIT_PROMPT_CLEAN=""               # Text to display if the branch is clean
 
 # Setup the prompt with pretty colors
 setopt prompt_subst
diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 7c43303..d905be0 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -9,7 +9,10 @@ export ZSH_THEME="robbyrussell"
 # export CASE_SENSITIVE="true"
 
 # Comment this out to disable weekly auto-update checks
-# export DISABLE_AUTO_UPDATE="false"
+# export DISABLE_AUTO_UPDATE="true"
+
+# Uncomment following line if you want to disable colors in ls
+# export DISABLE_LS_COLORS="true"
 
 source $ZSH/oh-my-zsh.sh
 

From 9c0dcdaefc87f9af941e4239a8806b957414e6c6 Mon Sep 17 00:00:00 2001
From: Toon Claes <toon@tonotdo.com>
Date: Thu, 5 Nov 2009 20:48:08 +0100
Subject: [PATCH 7/7] parse error fix

---
 lib/appearance.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/appearance.zsh b/lib/appearance.zsh
index c9bd25d..ffee52b 100644
--- a/lib/appearance.zsh
+++ b/lib/appearance.zsh
@@ -4,7 +4,8 @@ export LSCOLORS="Gxfxcxdxbxegedabagacad"
 #export LS_COLORS
 
 # Enable ls colors
-if [ "$DISABLE_LS_COLORS" != "true" ] then
+if [ "$DISABLE_LS_COLORS" != "true" ]
+then
   # Find the option for using colors in ls, depending on the version: Linux or BSD
   ls --color -d . &>/dev/null 2>&1 && alias ls='ls --color=tty' || alias ls='ls -G'
 fi