Browse code

Joined the appearance so the theme can apply LSCOLORS too

Toon Claes authored on 04/11/2009 at 19:37:18
Showing 6 changed files
... ...
@@ -45,7 +45,7 @@ alias gcp='git cherry-pick'
45 45
 alias history='fc -l 1'
46 46
 
47 47
 # List direcory contents
48
-alias ls='ls -F'
48
+alias ls='ls -F -G'
49 49
 alias lsa='ls -lahG'
50 50
 alias l='ls -la'
51 51
 alias ll='ls -alr'
52 52
new file mode 100644
... ...
@@ -0,0 +1,34 @@
0
+# Colors
1
+autoload colors; colors;
2
+export LSCOLORS="Gxfxcxdxbxegedabagacad"
3
+
4
+#setopt no_beep
5
+setopt auto_cd
6
+setopt multios
7
+setopt cdablevarS
8
+
9
+if [[ x$WINDOW != x ]]
10
+then
11
+    SCREEN_NO="%B$WINDOW%b "
12
+else
13
+    SCREEN_NO=""
14
+fi
15
+
16
+# Apply theming defaults
17
+PS1="%n@%m:%~%# "
18
+
19
+# git theming default: Variables for theming the git info prompt
20
+# ZSH_THEME_GIT_PROMPT_PREFIX - Prefix at the very beginning of the prompt, before the branch name
21
+ZSH_THEME_GIT_PROMPT_PREFIX="git:("
22
+# ZSH_THEME_GIT_PROMPT_SUFFIX - At the very end of the prompt
23
+ZSH_THEME_GIT_PROMPT_SUFFIX=")"
24
+# ZSH_THEME_GIT_PROMPT_DIRTY  - Text to display if the branch is dirty
25
+ZSH_THEME_GIT_PROMPT_DIRTY="*"
26
+# ZSH_THEME_GIT_PROMPT_CLEAN  - Text to display if the branch is clean
27
+ZSH_THEME_GIT_PROMPT_CLEAN=""
28
+
29
+# Setup the prompt with pretty colors
30
+setopt prompt_subst
31
+
32
+# Load the theme
33
+source "$ZSH/themes/$ZSH_THEME.zsh-theme"
0 34
\ No newline at end of file
1 35
deleted file mode 100644
... ...
@@ -1,4 +0,0 @@
1
-autoload colors; colors;
2
-
3
-unset LSCOLORS
4
-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'
... ...
@@ -1,14 +1,3 @@
1
-# Varables for themeing the git info prompt:
2
-# ZSH_THEME_GIT_PROMPT_PREFIX - Prefix at the very beginning of the prompt, before the branch name
3
-# ZSH_THEME_GIT_PROMPT_SUFFIX - At the very end of the prompt
4
-# ZSH_THEME_GIT_PROMPT_DIRTY  - Text to display if the branch is dirty
5
-# ZSH_THEME_GIT_PROMPT_CLEAN  - Text to display if the branch is clean
6
-
7
-ZSH_THEME_GIT_PROMPT_PREFIX="git:("
8
-ZSH_THEME_GIT_PROMPT_SUFFIX=")"
9
-ZSH_THEME_GIT_PROMPT_DIRTY="*"
10
-ZSH_THEME_GIT_PROMPT_CLEAN=""
11
-
12 1
 # get the name of the branch we are on
13 2
 function git_prompt_info() {
14 3
   ref=$(git symbolic-ref HEAD 2> /dev/null) || return
... ...
@@ -7,3 +7,7 @@ bindkey "^[m" copy-prev-shell-word
7 7
 
8 8
 ## jobs
9 9
 setopt long_list_jobs
10
+
11
+## pager
12
+export PAGER=less
13
+export LC_CTYPE=en_US.UTF-8
10 14
deleted file mode 100644
... ...
@@ -1,25 +0,0 @@
1
-export PAGER=less
2
-export LC_CTYPE=en_US.UTF-8
3
-
4
-# speed stuff.
5
-
6
-#setopt no_beep
7
-setopt auto_cd
8
-setopt multios
9
-setopt cdablevarS
10
-
11
-if [[ x$WINDOW != x ]]
12
-then
13
-    SCREEN_NO="%B$WINDOW%b "
14
-else
15
-    SCREEN_NO=""
16
-fi
17
-
18
-PS1="%n@%m:%~%# "
19
-
20
-# Setup the prompt with pretty colors
21
-setopt prompt_subst
22
-
23
-export LSCOLORS="Gxfxcxdxbxegedabagacad"
24
-
25
-source "$ZSH/themes/$ZSH_THEME.zsh-theme"