m/dotfiles
1
0
Fork 0
mirror of https://github.com/kremalicious/dotfiles.git synced 2024-11-22 01:37:14 +01:00
Code Releases Activity

tabs to spaces

Browse Source
This commit is contained in:
Matthias Kretschmann 2015-08-08 23:32:07 +02:00
parent 77a889ae23
commit c62d314f99
2 changed files with 75 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
bash_prompt
View File

@ -6,107 +6,107 @@
######################################################################## ########################################################################
if [[ $COLORTERM = gnome-* && $TERM = xterm ]] && infocmp gnome-256color >/dev/null 2>&1; then if [[ $COLORTERM = gnome-* && $TERM = xterm ]] && infocmp gnome-256color >/dev/null 2>&1; then
export TERM='gnome-256color'; export TERM='gnome-256color';
elif infocmp xterm-256color >/dev/null 2>&1; then elif infocmp xterm-256color >/dev/null 2>&1; then
export TERM='xterm-256color'; export TERM='xterm-256color';
fi; fi;
prompt_git() { prompt_git() {
local s=''; local s='';
local branchName=''; local branchName='';
# Check if the current directory is in a Git repository. # Check if the current directory is in a Git repository.
if [ $(git rev-parse --is-inside-work-tree &>/dev/null; echo "${?}") == '0' ]; then if [ $(git rev-parse --is-inside-work-tree &>/dev/null; echo "${?}") == '0' ]; then
# check if the current directory is in .git before running git checks # check if the current directory is in .git before running git checks
if [ "$(git rev-parse --is-inside-git-dir 2> /dev/null)" == 'false' ]; then if [ "$(git rev-parse --is-inside-git-dir 2> /dev/null)" == 'false' ]; then
# Ensure the index is up to date. # Ensure the index is up to date.
git update-index --really-refresh -q &>/dev/null; git update-index --really-refresh -q &>/dev/null;
# Check for uncommitted changes in the index. # Check for uncommitted changes in the index.
if ! $(git diff --quiet --ignore-submodules --cached); then if ! $(git diff --quiet --ignore-submodules --cached); then
s+='+'; s+='+';
fi; fi;
# Check for unstaged changes. # Check for unstaged changes.
if ! $(git diff-files --quiet --ignore-submodules --); then if ! $(git diff-files --quiet --ignore-submodules --); then
s+='!'; s+='!';
fi; fi;
# Check for untracked files. # Check for untracked files.
if [ -n "$(git ls-files --others --exclude-standard)" ]; then if [ -n "$(git ls-files --others --exclude-standard)" ]; then
s+='?'; s+='?';
fi; fi;
# Check for stashed files. # Check for stashed files.
if $(git rev-parse --verify refs/stash &>/dev/null); then if $(git rev-parse --verify refs/stash &>/dev/null); then
s+='$'; s+='$';
fi; fi;
fi; fi;
# Get the short symbolic ref. # Get the short symbolic ref.
# If HEAD isn’t a symbolic ref, get the short SHA for the latest commit # If HEAD isn’t a symbolic ref, get the short SHA for the latest commit
# Otherwise, just give up. # Otherwise, just give up.
branchName="$(git symbolic-ref --quiet --short HEAD 2> /dev/null || \ branchName="$(git symbolic-ref --quiet --short HEAD 2> /dev/null || \
git rev-parse --short HEAD 2> /dev/null || \ git rev-parse --short HEAD 2> /dev/null || \
echo '(unknown)')"; echo '(unknown)')";
[ -n "${s}" ] && s=" [${s}]"; [ -n "${s}" ] && s=" [${s}]";
echo -e "${1}${branchName}${blue}${s}"; echo -e "${1}${branchName}${blue}${s}";
else else
return; return;
fi; fi;
} }
if tput setaf 1 &> /dev/null; then if tput setaf 1 &> /dev/null; then
tput sgr0; # reset colors tput sgr0; # reset colors
bold=$(tput bold); bold=$(tput bold);
reset=$(tput sgr0); reset=$(tput sgr0);
# Solarized colors, taken from http://git.io/solarized-colors. # Solarized colors, taken from http://git.io/solarized-colors.
black=$(tput setaf 0); black=$(tput setaf 0);
blue=$(tput setaf 33); blue=$(tput setaf 33);
cyan=$(tput setaf 37); cyan=$(tput setaf 37);
green=$(tput setaf 64); green=$(tput setaf 64);
orange=$(tput setaf 166); orange=$(tput setaf 166);
purple=$(tput setaf 125); purple=$(tput setaf 125);
red=$(tput setaf 124); red=$(tput setaf 124);
violet=$(tput setaf 61); violet=$(tput setaf 61);
white=$(tput setaf 15); white=$(tput setaf 15);
yellow=$(tput setaf 136); yellow=$(tput setaf 136);
else else
bold=''; bold='';
reset="\e[0m"; reset="\e[0m";
black="\e[1;30m"; black="\e[1;30m";
blue="\e[1;34m"; blue="\e[1;34m";
cyan="\e[1;36m"; cyan="\e[1;36m";
green="\e[1;32m"; green="\e[1;32m";
orange="\e[1;33m"; orange="\e[1;33m";
purple="\e[1;35m"; purple="\e[1;35m";
red="\e[1;31m"; red="\e[1;31m";
violet="\e[1;35m"; violet="\e[1;35m";
white="\e[1;37m"; white="\e[1;37m";
yellow="\e[1;33m"; yellow="\e[1;33m";
fi; fi;
# Highlight the user name when logged in as root. # Highlight the user name when logged in as root.
if [[ "${USER}" == "root" ]]; then if [[ "${USER}" == "root" ]]; then
userStyle="${red}"; userStyle="${red}";
else else
userStyle="${orange}"; userStyle="${orange}";
fi; fi;
# Highlight the hostname when connected via SSH. # Highlight the hostname when connected via SSH.
if [[ "${SSH_TTY}" ]]; then if [[ "${SSH_TTY}" ]]; then
hostStyle="${bold}${red}"; hostStyle="${bold}${red}";
else else
hostStyle="${yellow}"; hostStyle="${yellow}";
fi; fi;
# Set the terminal title to the current working directory. # Set the terminal title to the current working directory.
#PS1="\[\033]0;\w\007\]"; PS1="\[\033]0;\w\007\]";
PS1="\[${bold}\]\n"; # newline PS1="\[${bold}\]\n"; # newline
PS1+="\[${userStyle}\]\u"; # username PS1+="\[${userStyle}\]\u"; # username
PS1+="\[${white}\] at "; PS1+="\[${white}\] at ";
@ -119,4 +119,4 @@ PS1+="\[${white}\]→ \[${reset}\]"; # `→` (and reset color)
export PS1; export PS1;
PS2="\[${yellow}\]→ \[${reset}\]"; PS2="\[${yellow}\]→ \[${reset}\]";
export PS2; export PS2;

10
osx
View File

@ -61,7 +61,7 @@ chflags nohidden ~/Library
############################################################################### ###############################################################################
# Set Safari’s home page to `about:blank` for faster loading # Set Safari’s home page to `about:blank` for faster loading
defaults write com.apple.Safari HomePage -string "about:blank" defaults write com.apple.Safari HomePage -string ""
# Make Safari’s search banners default to Contains instead of Starts With # Make Safari’s search banners default to Contains instead of Starts With
defaults write com.apple.Safari FindOnPageMatchesWordStartsOnly -bool false defaults write com.apple.Safari FindOnPageMatchesWordStartsOnly -bool false
@ -115,8 +115,8 @@ hash tmutil &> /dev/null && sudo tmutil disablelocal
############################################################################### ###############################################################################
for app in "Activity Monitor" "Address Book" "Calendar" "Contacts" "cfprefsd" \ for app in "Activity Monitor" "Address Book" "Calendar" "Contacts" "cfprefsd" \
"Dock" "Finder" "Mail" "Messages" "Safari" "SystemUIServer" \ "Dock" "Finder" "Mail" "Messages" "Safari" "SystemUIServer" \
"Terminal"; do "Terminal"; do
killall "${app}" > /dev/null 2>&1 killall "${app}" > /dev/null 2>&1
done done
echo "Done. Note that some of these changes require a logout/restart to take effect." echo "Done. Note that some of these changes require a logout/restart to take effect."