mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-11-19 21:41:07 +01:00
Joined the appearance so the theme can apply LSCOLORS too
This commit is contained in:
parent
e53f90425e
commit
e2dba2c3e9
6 changed files with 39 additions and 41 deletions
|
@ -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'
|
||||
|
|
34
lib/appearance.zsh
Normal file
34
lib/appearance.zsh
Normal file
|
@ -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"
|
|
@ -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'
|
11
lib/git.zsh
11
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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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"
|
Loading…
Reference in a new issue