now with more awesome git prompt
This commit is contained in:
		
							parent
							
								
									2eda674d6d
								
							
						
					
					
						commit
						1e70e1ef19
					
				
					 1 changed files with 22 additions and 3 deletions
				
			
		
							
								
								
									
										25
									
								
								bashrc
									
										
									
									
									
								
							
							
						
						
									
										25
									
								
								bashrc
									
										
									
									
									
								
							| 
						 | 
					@ -11,6 +11,9 @@ gem_bin="${HOME}/.local/gem-bin"
 | 
				
			||||||
unset local_bin vscripts gem_bin
 | 
					unset local_bin vscripts gem_bin
 | 
				
			||||||
 | 
					
 | 
				
			||||||
dotfiles="${HOME}/vdotfiles"
 | 
					dotfiles="${HOME}/vdotfiles"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					completion_path='/usr/share/bash-completion/bash_completion'
 | 
				
			||||||
 | 
					git_prompt_path='/usr/lib/bash-git-prompt/gitprompt.sh'
 | 
				
			||||||
comp_enabled=true
 | 
					comp_enabled=true
 | 
				
			||||||
git_enabled=true
 | 
					git_enabled=true
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -149,15 +152,31 @@ alias tmux='command tmux -2'
 | 
				
			||||||
alias atmux='command tmux -2 attach'
 | 
					alias atmux='command tmux -2 attach'
 | 
				
			||||||
# }}}
 | 
					# }}}
 | 
				
			||||||
# {{{ plugins
 | 
					# {{{ plugins
 | 
				
			||||||
completion_path='/usr/share/bash-completion/bash_completion'
 | 
					 | 
				
			||||||
git_prompt_path='/usr/lib/bash-git-prompt/gitprompt.sh'
 | 
					 | 
				
			||||||
if [[ -n ${comp_enabled} && -r ${completion_path} ]]; then
 | 
					if [[ -n ${comp_enabled} && -r ${completion_path} ]]; then
 | 
				
			||||||
	source ${completion_path}
 | 
						source ${completion_path}
 | 
				
			||||||
fi
 | 
					fi
 | 
				
			||||||
if [[ -n ${git_enabled} && -r ${git_prompt_path} ]]; then
 | 
					if [[ -n ${git_enabled} && -r ${git_prompt_path} ]]; then
 | 
				
			||||||
	GIT_PROMPT_ONLY_IN_REPO=1
 | 
						GIT_PROMPT_ONLY_IN_REPO=1
 | 
				
			||||||
	GIT_PROMPT_THEME=Solarized
 | 
					 | 
				
			||||||
	source ${git_prompt_path}
 | 
						source ${git_prompt_path}
 | 
				
			||||||
 | 
						# theme overrides
 | 
				
			||||||
 | 
						if [[ $USER == 'von' ]]; then
 | 
				
			||||||
 | 
							git_prompt_username=""
 | 
				
			||||||
 | 
						else
 | 
				
			||||||
 | 
							git_prompt_username="${pnred}${USER}${preset} "
 | 
				
			||||||
 | 
						fi
 | 
				
			||||||
 | 
						GIT_PROMPT_PREFIX="[ "
 | 
				
			||||||
 | 
						GIT_PROMPT_SUFFIX=" ]"
 | 
				
			||||||
 | 
						GIT_PROMPT_SEPARATOR=""
 | 
				
			||||||
 | 
						GIT_PROMPT_START="[ ${git_prompt_username}${HOSTNAME}:\w ]"
 | 
				
			||||||
 | 
						GIT_PROMPT_THEME_NAME="Custom"
 | 
				
			||||||
 | 
						GIT_PROMPT_UNTRACKED=" ${pncyan}u"
 | 
				
			||||||
 | 
						GIT_PROMPT_CHANGED=" ${pnblue}+"
 | 
				
			||||||
 | 
						GIT_PROMPT_STAGED=" ${pnyellow}s"
 | 
				
			||||||
 | 
						GIT_PROMPT_CONFLICTS=" ${pnred}x"
 | 
				
			||||||
 | 
						GIT_PROMPT_STASHED=" ${pbmagenta}→"
 | 
				
			||||||
 | 
						GIT_PROMPT_CLEAN=" ${pngreen}v"
 | 
				
			||||||
 | 
						GIT_PROMPT_END_USER="\n${pbold}>${preset} "
 | 
				
			||||||
 | 
						GIT_PROMPT_END_ROOT="\n${pnred}>${preset} "
 | 
				
			||||||
fi
 | 
					fi
 | 
				
			||||||
unset completion_path git_prompt_path
 | 
					unset completion_path git_prompt_path
 | 
				
			||||||
# }}}
 | 
					# }}}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue