Diff
1diff --git a/lib/aliases.zsh b/lib/aliases.zsh
2index 6667a6724db5807c98a234e4f1fb159c3fa39d0f..c3a6cf0735469c859ba83639dddacdb4d6b217ff 100644
3--- a/lib/aliases.zsh
4+++ b/lib/aliases.zsh
5@@ -45,7 +45,7 @@ alias gcp='git cherry-pick'
6 alias history='fc -l 1'
7
8 # List direcory contents
9-alias ls='ls -F'
10+alias ls='ls -F -G'
11 alias lsa='ls -lahG'
12 alias l='ls -la'
13 alias ll='ls -alr'
14diff --git a/lib/appearance.zsh b/lib/appearance.zsh
15new file mode 100644
16index 0000000000000000000000000000000000000000..b1f5a8a387a1566d73719ef8da45a90c98b1f1e3
17--- /dev/null
18+++ b/lib/appearance.zsh
19@@ -0,0 +1,34 @@
20+# Colors
21+autoload colors; colors;
22+export LSCOLORS="Gxfxcxdxbxegedabagacad"
23+
24+#setopt no_beep
25+setopt auto_cd
26+setopt multios
27+setopt cdablevarS
28+
29+if [[ x$WINDOW != x ]]
30+then
31+ SCREEN_NO="%B$WINDOW%b "
32+else
33+ SCREEN_NO=""
34+fi
35+
36+# Apply theming defaults
37+PS1="%n@%m:%~%# "
38+
39+# git theming default: Variables for theming the git info prompt
40+# ZSH_THEME_GIT_PROMPT_PREFIX - Prefix at the very beginning of the prompt, before the branch name
41+ZSH_THEME_GIT_PROMPT_PREFIX="git:("
42+# ZSH_THEME_GIT_PROMPT_SUFFIX - At the very end of the prompt
43+ZSH_THEME_GIT_PROMPT_SUFFIX=")"
44+# ZSH_THEME_GIT_PROMPT_DIRTY - Text to display if the branch is dirty
45+ZSH_THEME_GIT_PROMPT_DIRTY="*"
46+# ZSH_THEME_GIT_PROMPT_CLEAN - Text to display if the branch is clean
47+ZSH_THEME_GIT_PROMPT_CLEAN=""
48+
49+# Setup the prompt with pretty colors
50+setopt prompt_subst
51+
52+# Load the theme
53+source "$ZSH/themes/$ZSH_THEME.zsh-theme"
54diff --git a/lib/colors.zsh b/lib/colors.zsh
55deleted file mode 100644
56index b2b08f929e0a42f9784e35533389a432e333e425..0000000000000000000000000000000000000000
57--- a/lib/colors.zsh
58+++ /dev/null
59@@ -1,4 +0,0 @@
60-autoload colors; colors;
61-
62-unset LSCOLORS
63-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'
64diff --git a/lib/git.zsh b/lib/git.zsh
65index 9409c92dbbe8289183be19e8d12a9b3ee2bb0324..84a3af0b97e46faf49516fec58f43bd8f8401301 100644
66--- a/lib/git.zsh
67+++ b/lib/git.zsh
68@@ -1,14 +1,3 @@
69-# Varables for themeing the git info prompt:
70-# ZSH_THEME_GIT_PROMPT_PREFIX - Prefix at the very beginning of the prompt, before the branch name
71-# ZSH_THEME_GIT_PROMPT_SUFFIX - At the very end of the prompt
72-# ZSH_THEME_GIT_PROMPT_DIRTY - Text to display if the branch is dirty
73-# ZSH_THEME_GIT_PROMPT_CLEAN - Text to display if the branch is clean
74-
75-ZSH_THEME_GIT_PROMPT_PREFIX="git:("
76-ZSH_THEME_GIT_PROMPT_SUFFIX=")"
77-ZSH_THEME_GIT_PROMPT_DIRTY="*"
78-ZSH_THEME_GIT_PROMPT_CLEAN=""
79-
80 # get the name of the branch we are on
81 function git_prompt_info() {
82 ref=$(git symbolic-ref HEAD 2> /dev/null) || return
83diff --git a/lib/misc.zsh b/lib/misc.zsh
84index a01627d9e7fa43ed0391a252a79709a83a36ba93..4c1743657fc1f70a3de0b2ca37fa7c0df7b05843 100644
85--- a/lib/misc.zsh
86+++ b/lib/misc.zsh
87@@ -7,3 +7,7 @@ bindkey "^[m" copy-prev-shell-word
88
89 ## jobs
90 setopt long_list_jobs
91+
92+## pager
93+export PAGER=less
94+export LC_CTYPE=en_US.UTF-8
95diff --git a/lib/prompt.zsh b/lib/prompt.zsh
96deleted file mode 100644
97index 39689684f725c00f01ea86c199a8dd6288470885..0000000000000000000000000000000000000000
98--- a/lib/prompt.zsh
99+++ /dev/null
100@@ -1,25 +0,0 @@
101-export PAGER=less
102-export LC_CTYPE=en_US.UTF-8
103-
104-# speed stuff.
105-
106-#setopt no_beep
107-setopt auto_cd
108-setopt multios
109-setopt cdablevarS
110-
111-if [[ x$WINDOW != x ]]
112-then
113- SCREEN_NO="%B$WINDOW%b "
114-else
115- SCREEN_NO=""
116-fi
117-
118-PS1="%n@%m:%~%# "
119-
120-# Setup the prompt with pretty colors
121-setopt prompt_subst
122-
123-export LSCOLORS="Gxfxcxdxbxegedabagacad"
124-
125-source "$ZSH/themes/$ZSH_THEME.zsh-theme"