diff --git a/zsh/.zshrc b/zsh/.zshrc index a874a4e..1be4c62 100755 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -1,9 +1,6 @@ # Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc. # Initialization code that may require console input (password prompts, [y/n] # confirmations, etc.) must go above this block; everything else may go below. -if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then - source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" -fi zstyle :omz:plugins:ssh-agent agent-forwarding on # @@ -17,7 +14,6 @@ export ZSH=$HOME/.oh-my-zsh # Set name of the theme to load. Optionally, if you set this to "random" # it'll load a random theme each time that oh-my-zsh is loaded. # See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes -ZSH_THEME="rkj-repos" #ZSH_THEME="agnoster" # Uncomment the following line to use case-sensitive completion. # CASE_SENSITIVE="true" @@ -97,13 +93,11 @@ if [[ ! -d $ZSH_CACHE_DIR ]]; then mkdir $ZSH_CACHE_DIR fi +for file in ~/.zshrc.d/*; do + source "$file" +done source $ZSH/oh-my-zsh.sh -for file in ~/.zshrc.d/*; do - source "$file" -done -# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. -[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh diff --git a/zsh/.zshrc.d/prompt b/zsh/.zshrc.d/prompt index 81133c7..8541240 100644 --- a/zsh/.zshrc.d/prompt +++ b/zsh/.zshrc.d/prompt @@ -7,11 +7,12 @@ ##set zsh theme et dircolor en fonction de term if [ $TERM != "linux" ]; then POWERLEVEL9K_MODE="awesome-fontconfig" - source /usr/share/zsh-theme-powerlevel10k/powerlevel10k.zsh-theme + ZSH_THEME="powerlevel10k/powerlevel10k" eval `dircolors ~/.dircolors/dircolors.256dark` POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(ssh context dir rbenv vcs) POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=(status virtualenv root_indicator background_jobs history time) else +i ZSH_THEME="rkj-repos" eval `dircolors ~/.dircolors/dircolors.ansi-dark` fi zstyle ':completion:*:default' list-colors ${(s.:.)LS_COLORS}