mirror of
				https://github.com/ohmyzsh/ohmyzsh.git
				synced 2025-11-04 13:21:19 +08:00 
			
		
		
		
	feat(jonathan): add conda support (#13243)
This commit is contained in:
		
							parent
							
								
									5c804257ce
								
							
						
					
					
						commit
						a6beb0f595
					
				@ -8,14 +8,15 @@ function theme_precmd {
 | 
				
			|||||||
  local rubypromptsize=${#${(%)$(ruby_prompt_info)}}
 | 
					  local rubypromptsize=${#${(%)$(ruby_prompt_info)}}
 | 
				
			||||||
  local pwdsize=${#${(%):-%~}}
 | 
					  local pwdsize=${#${(%):-%~}}
 | 
				
			||||||
  local venvpromptsize=$((${#$(virtualenv_prompt_info)}))
 | 
					  local venvpromptsize=$((${#$(virtualenv_prompt_info)}))
 | 
				
			||||||
 | 
					  local condapromptsize=$((${#$(conda_prompt_info)}))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  # Truncate the path if it's too long.
 | 
					  # Truncate the path if it's too long.
 | 
				
			||||||
  if (( promptsize + rubypromptsize + pwdsize + venvpromptsize > TERMWIDTH )); then
 | 
					  if (( promptsize + rubypromptsize + pwdsize + venvpromptsize + condapromptsize > TERMWIDTH )); then
 | 
				
			||||||
    (( PR_PWDLEN = TERMWIDTH - promptsize ))
 | 
					    (( PR_PWDLEN = TERMWIDTH - promptsize ))
 | 
				
			||||||
  elif [[ "${langinfo[CODESET]}" = UTF-8 ]]; then
 | 
					  elif [[ "${langinfo[CODESET]}" = UTF-8 ]]; then
 | 
				
			||||||
    PR_FILLBAR="\${(l:$(( TERMWIDTH - (promptsize + rubypromptsize + pwdsize + venvpromptsize ) ))::${PR_HBAR}:)}"
 | 
					    PR_FILLBAR="\${(l:$(( TERMWIDTH - (promptsize + rubypromptsize + pwdsize + venvpromptsize + condapromptsize ) ))::${PR_HBAR}:)}"
 | 
				
			||||||
  else
 | 
					  else
 | 
				
			||||||
    PR_FILLBAR="${PR_SHIFT_IN}\${(l:$(( TERMWIDTH - (promptsize + rubypromptsize + pwdsize + venvpromptsize ) ))::${altchar[q]:--}:)}${PR_SHIFT_OUT}"
 | 
					    PR_FILLBAR="${PR_SHIFT_IN}\${(l:$(( TERMWIDTH - (promptsize + rubypromptsize + pwdsize + venvpromptsize + condapromptsize ) ))::${altchar[q]:--}:)}${PR_SHIFT_OUT}"
 | 
				
			||||||
  fi
 | 
					  fi
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -104,7 +105,7 @@ fi
 | 
				
			|||||||
PROMPT='${PR_SET_CHARSET}${PR_STITLE}${(e)PR_TITLEBAR}\
 | 
					PROMPT='${PR_SET_CHARSET}${PR_STITLE}${(e)PR_TITLEBAR}\
 | 
				
			||||||
${PR_CYAN}${PR_ULCORNER}${PR_HBAR}${PR_GREY}(\
 | 
					${PR_CYAN}${PR_ULCORNER}${PR_HBAR}${PR_GREY}(\
 | 
				
			||||||
${PR_GREEN}%${PR_PWDLEN}<...<%~%<<\
 | 
					${PR_GREEN}%${PR_PWDLEN}<...<%~%<<\
 | 
				
			||||||
${PR_GREY})$(virtualenv_prompt_info)$(ruby_prompt_info)${PR_CYAN}${PR_HBAR}${PR_HBAR}${(e)PR_FILLBAR}${PR_HBAR}${PR_GREY}(\
 | 
					${PR_GREY})$(virtualenv_prompt_info)$(ruby_prompt_info)$(conda_prompt_info)${PR_CYAN}${PR_HBAR}${PR_HBAR}${(e)PR_FILLBAR}${PR_HBAR}${PR_GREY}(\
 | 
				
			||||||
${PR_CYAN}%(!.%SROOT%s.%n)${PR_GREY}@${PR_GREEN}%m:%l\
 | 
					${PR_CYAN}%(!.%SROOT%s.%n)${PR_GREY}@${PR_GREEN}%m:%l\
 | 
				
			||||||
${PR_GREY})${PR_CYAN}${PR_HBAR}${PR_URCORNER}\
 | 
					${PR_GREY})${PR_CYAN}${PR_HBAR}${PR_URCORNER}\
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user