zsh: remove + spread theme-and-appearance.zsh

diff --git a/aliases b/aliases
index e64bb85f5d8a2c0cc64d9defe2e80aec475ae9c0..92baf77c59a73bfcbf2879c72663b1e625a8015e 100644 (file)
--- a/aliases
+++ b/aliases
@@ -2,6 +2,7 @@
 # this will allow aliasing any command after sudo
 alias sudo='sudo '
 
+alias ls='ls --color=auto'
 alias l='ls --color=auto -F'
 alias ls='ls --color=auto -F'
 alias ll='ls -lh --color=auto -F'

diff --git a/zsh/lib/misc.zsh b/zsh/lib/misc.zsh
index 3de8a53d2d77bbb04ae2bd62cb0c9441764c9a18..8667e83af8ffd7a835d4ac763cec8725d0510a48 100644 (file)
--- a/zsh/lib/misc.zsh
+++ b/zsh/lib/misc.zsh
@@ -12,4 +12,7 @@ setopt long_list_jobs
 export PAGER="less"
 export LESS="-SR"
 
+# ls colors
+eval $(dircolors $XDG_CONFIG_HOME/dircolors)
+
 export LC_CTYPE=$LANG

diff --git a/zsh/lib/prompt.zsh b/zsh/lib/prompt.zsh
index 4f313482deefe0c0836d694a295dacb95efd51a3..03345162b5ee53d575a32ffc12bb3287b1c06cd4 100644 (file)
--- a/zsh/lib/prompt.zsh
+++ b/zsh/lib/prompt.zsh
@@ -1,3 +1,7 @@
+# Setup the prompt with pretty colors
+setopt prompt_subst
+autoload colors; colors;
+
 hostcolor=green
 [[ $(hostname) == "tardis" ]]  && hostcolor=red
 

diff --git a/zsh/lib/theme-and-appearance.zsh b/zsh/lib/theme-and-appearance.zsh
deleted file mode 100644 (file)
index 4900895..0000000
--- a/zsh/lib/theme-and-appearance.zsh
+++ /dev/null
@@ -1,28 +0,0 @@
-# ls colors
-autoload colors; colors;
-eval $(dircolors $XDG_CONFIG_HOME/dircolors)
-
-# Enable ls colors
-ls='ls --color=auto'
-
-setopt no_beep
-setopt multios
-
-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="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