diff --git a/.bash_prompt b/.bash_prompt index c9a821d..5322c02 100644 --- a/.bash_prompt +++ b/.bash_prompt @@ -1,57 +1,120 @@ -# @gf3’s Sexy Bash Prompt, inspired by “Extravagant Zsh Prompt” -# Shamelessly copied from https://github.com/gf3/dotfiles -# Screenshot: http://i.imgur.com/s0Blh.png +# Shell prompt based on the Solarized Dark theme. +# Screenshot: http://i.imgur.com/EkEtphC.png +# Heavily inspired by @necolas’s prompt: https://github.com/necolas/dotfiles +# iTerm → Profiles → Text → use 13pt Monaco with 1.1 vertical spacing. 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 - export TERM=xterm-256color; -fi - -if tput setaf 1 &> /dev/null; then - tput sgr0; # reset colors - if [[ $(tput colors) -ge 256 ]] 2>/dev/null; then - MAGENTA=$(tput setaf 9); - ORANGE=$(tput setaf 172); - GREEN=$(tput setaf 190); - PURPLE=$(tput setaf 141); - WHITE=$(tput setaf 0); - else - MAGENTA=$(tput setaf 5); - ORANGE=$(tput setaf 4); - GREEN=$(tput setaf 2); - PURPLE=$(tput setaf 1); - WHITE=$(tput setaf 7); - fi; - BOLD=$(tput bold); - RESET=$(tput sgr0); -else - MAGENTA="\033[1;31m"; - ORANGE="\033[1;33m"; - GREEN="\033[1;32m"; - PURPLE="\033[1;35m"; - WHITE="\033[1;37m"; - BOLD=""; - RESET="\033[m"; + export TERM='xterm-256color'; fi; -export MAGENTA; -export ORANGE; -export GREEN; -export PURPLE; -export WHITE; -export BOLD; -export RESET; +prompt_git() { + local s=''; + local branchName=''; -function parse_git_branch() { - local branch=$(git rev-parse --abbrev-ref HEAD 2>/dev/null); - if [ -n "${branch}" ]; then - [ "${branch}" == "HEAD" ] && local branch=$(git rev-parse --short HEAD 2>/dev/null); - local status=$(git status --porcelain 2>/dev/null); - echo -n " on ${PURPLE}${branch}"; - [ -n "${status}" ] && echo -n "*"; + # Check if the current directory is in a Git repository. + 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 + if [ "$(git rev-parse --is-inside-git-dir 2> /dev/null)" == 'false' ]; then + + # Ensure the index is up to date. + git update-index --really-refresh -q &>/dev/null; + + # Check for uncommitted changes in the index. + if ! $(git diff --quiet --ignore-submodules --cached); then + s+='+'; + fi; + + # Check for unstaged changes. + if ! $(git diff-files --quiet --ignore-submodules --); then + s+='!'; + fi; + + # Check for untracked files. + if [ -n "$(git ls-files --others --exclude-standard)" ]; then + s+='?'; + fi; + + # Check for stashed files. + if $(git rev-parse --verify refs/stash &>/dev/null); then + s+='$'; + fi; + + fi; + + # Get the short symbolic ref. + # If HEAD isn’t a symbolic ref, get the short SHA for the latest commit + # Otherwise, just give up. + branchName="$(git symbolic-ref --quiet --short HEAD 2> /dev/null || \ + git rev-parse --short HEAD 2> /dev/null || \ + echo '(unknown)')"; + + [ -n "${s}" ] && s=" [${s}]"; + + echo "${1}${branchName}${blue}${s}"; + else + return; fi; } -export PS1="\[${BOLD}${MAGENTA}\]\u \[$WHITE\]at \[$ORANGE\]\h \[$WHITE\]in \[$GREEN\]\w\[$WHITE\]\$(parse_git_branch)\[$WHITE\]\n\$ \[$RESET\]"; -export PS2="\[$ORANGE\]→ \[$RESET\]"; +if tput setaf 1 &> /dev/null; then + tput sgr0; # reset colors + bold=$(tput bold); + reset=$(tput sgr0); + # Solarized colors, taken from http://git.io/solarized-colors. + black=$(tput setaf 0); + blue=$(tput setaf 33); + cyan=$(tput setaf 37); + green=$(tput setaf 64); + orange=$(tput setaf 166); + purple=$(tput setaf 125); + red=$(tput setaf 124); + violet=$(tput setaf 61); + white=$(tput setaf 15); + yellow=$(tput setaf 136); +else + bold=''; + reset="\e[0m"; + black="\e[1;30m"; + blue="\e[1;34m"; + cyan="\e[1;36m"; + green="\e[1;32m"; + orange="\e[1;33m"; + purple="\e[1;35m"; + red="\e[1;31m"; + violet="\e[1;35m"; + white="\e[1;37m"; + yellow="\e[1;33m"; +fi; + +# Highlight the user name when logged in as root. +if [[ "${USER}" == "root" ]]; then + userStyle="\[${red}\]"; +else + userStyle="\[${orange}\]"; +fi; + +# Highlight the hostname when connected via SSH. +if [[ "${SSH_TTY}" ]]; then + hostStyle="\[${bold}${red}\]"; +else + hostStyle="\[${yellow}\]"; +fi; + +# Set the terminal title to the current working directory. +PS1="\[\033]0;\w\007\]"; +PS1+="\[${bold}\]\n"; # newline +PS1+="\[${userStyle}\]\u"; # username +PS1+="\[${white}\] at "; +PS1+="\[${hostStyle}\]\h"; # host +PS1+="\[${white}\] in "; +PS1+="\[${green}\]\w"; # working directory +PS1+="\$(prompt_git \"${white} on ${violet}\")"; # Git repository details +PS1+="\n"; +PS1+="\[${white}\]\$ \[${reset}\]"; # `$` (and reset color) +export PS1; + +PS2="\[${yellow}\]→ \[${reset}\]"; +export PS2; diff --git a/.exports b/.exports index 25d913f..9f44069 100644 --- a/.exports +++ b/.exports @@ -13,7 +13,7 @@ export LANG="en_US.UTF-8"; export LC_ALL="en_US.UTF-8"; # Highlight section titles in manual pages -export LESS_TERMCAP_md="${ORANGE}"; +export LESS_TERMCAP_md="${yellow}"; # Don’t clear the screen after quitting a manual page export MANPAGER="less -X"; diff --git a/.osx b/.osx index 788b8fa..e45c384 100755 --- a/.osx +++ b/.osx @@ -545,8 +545,8 @@ sudo mdutil -E / > /dev/null # Only use UTF-8 in Terminal.app defaults write com.apple.terminal StringEncodings -array 4 -# Use a modified version of the Pro theme by default in Terminal.app -TERM_PROFILE='Mathias'; +# Use a modified version of the Solarized Dark theme by default in Terminal.app +TERM_PROFILE='Solarized Dark xterm-256color'; CURRENT_PROFILE="$(defaults read com.apple.terminal 'Default Window Settings')"; if [ "${CURRENT_PROFILE}" != "${TERM_PROFILE}" ]; then open "${HOME}/init/${TERM_PROFILE}.terminal"; @@ -560,8 +560,8 @@ fi; #defaults write com.apple.terminal FocusFollowsMouse -bool true #defaults write org.x.X11 wm_ffm -bool true -# Install pretty iTerm colors -open "${HOME}/init/Mathias.itermcolors" +# Install the Solarized Dark theme for iTerm +open "${HOME}/init/Solarized Dark.itermcolors" # Don’t display the annoying prompt when quitting iTerm defaults write com.googlecode.iterm2 PromptOnQuit -bool false diff --git a/README.md b/README.md index e412d51..25225ea 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # Mathias’s dotfiles +![Screenshot of my shell prompt](http://i.imgur.com/EkEtphC.png) + ## Installation ### Using Git and the bootstrap script diff --git a/init/Mathias.terminal b/init/Mathias.terminal deleted file mode 100644 index 761974a..0000000 --- a/init/Mathias.terminal +++ /dev/null @@ -1,232 +0,0 @@ - - - - - ANSIBlackColor - - YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS - AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NGMCAw - IDAAEAGAAtIQERITWiRjbGFzc25hbWVYJGNsYXNzZXNXTlNDb2xvcqISFFhOU09iamVj - dF8QD05TS2V5ZWRBcmNoaXZlctEXGFRyb290gAEIERojLTI3O0FITltiaWttcn2GjpGa - rK+0AAAAAAAAAQEAAAAAAAAAGQAAAAAAAAAAAAAAAAAAALY= - - ANSIBlueColor - - YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS - AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPEBww - Ljc2ODYyNzQ2NDggMC41NTI5NDEyMDMxIDEAEAGAAtIQERITWiRjbGFzc25hbWVYJGNs - YXNzZXNXTlNDb2xvcqISFFhOU09iamVjdF8QD05TS2V5ZWRBcmNoaXZlctEXGFRyb290 - gAEIERojLTI3O0FITltigYOFipWepqmyxMfMAAAAAAAAAQEAAAAAAAAAGQAAAAAAAAAA - AAAAAAAAAM4= - - ANSIBrightBlackColor - - YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS - AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw - LjMzMzMzMzMzMzMgMC4zMzMzMzMzMzMzIDAuMzMzMzMzMzMzMwAQAYAC0hAREhNaJGNs - YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp - dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA - AAAZAAAAAAAAAAAAAAAAAAAA2Q== - - ANSIBrightBlueColor - - YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS - AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPEBww - LjMzMzMzMzM0MzMgMC4zMzMzMzMzNDMzIDEAEAGAAtIQERITWiRjbGFzc25hbWVYJGNs - YXNzZXNXTlNDb2xvcqISFFhOU09iamVjdF8QD05TS2V5ZWRBcmNoaXZlctEXGFRyb290 - gAEIERojLTI3O0FITltigYOFipWepqmyxMfMAAAAAAAAAQEAAAAAAAAAGQAAAAAAAAAA - AAAAAAAAAM4= - - ANSIBrightCyanColor - - YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS - AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPEBEw - LjMzMzMzMzM0MzMgMSAxABABgALSEBESE1okY2xhc3NuYW1lWCRjbGFzc2VzV05TQ29s - b3KiEhRYTlNPYmplY3RfEA9OU0tleWVkQXJjaGl2ZXLRFxhUcm9vdIABCBEaIy0yNztB - SE5bYnZ4en+Kk5uep7m8wQAAAAAAAAEBAAAAAAAAABkAAAAAAAAAAAAAAAAAAADD - - ANSIBrightGreenColor - - YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS - AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPEBww - LjMzMzMzMzM0MzMgMSAwLjMzMzMzMzM0MzMAEAGAAtIQERITWiRjbGFzc25hbWVYJGNs - YXNzZXNXTlNDb2xvcqISFFhOU09iamVjdF8QD05TS2V5ZWRBcmNoaXZlctEXGFRyb290 - gAEIERojLTI3O0FITltigYOFipWepqmyxMfMAAAAAAAAAQEAAAAAAAAAGQAAAAAAAAAA - AAAAAAAAAM4= - - ANSIBrightMagentaColor - - YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS - AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPEBEx - IDAuMzMzMzMzMzQzMyAxABABgALSEBESE1okY2xhc3NuYW1lWCRjbGFzc2VzV05TQ29s - b3KiEhRYTlNPYmplY3RfEA9OU0tleWVkQXJjaGl2ZXLRFxhUcm9vdIABCBEaIy0yNztB - SE5bYnZ4en+Kk5uep7m8wQAAAAAAAAEBAAAAAAAAABkAAAAAAAAAAAAAAAAAAADD - - ANSIBrightRedColor - - YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS - AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPEBwx - IDAuMzMzMzMzMzQzMyAwLjMzMzMzMzM0MzMAEAGAAtIQERITWiRjbGFzc25hbWVYJGNs - YXNzZXNXTlNDb2xvcqISFFhOU09iamVjdF8QD05TS2V5ZWRBcmNoaXZlctEXGFRyb290 - gAEIERojLTI3O0FITltigYOFipWepqmyxMfMAAAAAAAAAQEAAAAAAAAAGQAAAAAAAAAA - AAAAAAAAAM4= - - ANSIBrightWhiteColor - - YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS - AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NGMSAx - IDEAEAGAAtIQERITWiRjbGFzc25hbWVYJGNsYXNzZXNXTlNDb2xvcqISFFhOU09iamVj - dF8QD05TS2V5ZWRBcmNoaXZlctEXGFRyb290gAEIERojLTI3O0FITltiaWttcn2GjpGa - rK+0AAAAAAAAAQEAAAAAAAAAGQAAAAAAAAAAAAAAAAAAALY= - - ANSIBrightYellowColor - - YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS - AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPEBEx - IDEgMC4zMzMzMzMzNDMzABABgALSEBESE1okY2xhc3NuYW1lWCRjbGFzc2VzV05TQ29s - b3KiEhRYTlNPYmplY3RfEA9OU0tleWVkQXJjaGl2ZXLRFxhUcm9vdIABCBEaIy0yNztB - SE5bYnZ4en+Kk5uep7m8wQAAAAAAAAEBAAAAAAAAABkAAAAAAAAAAAAAAAAAAADD - - ANSICyanColor - - YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS - AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECYw - LjQwMzkyMTU3NDQgMC44NTA5ODA0MDEgMC45NDExNzY0NzQxABABgALSEBESE1okY2xh - c3NuYW1lWCRjbGFzc2VzV05TQ29sb3KiEhRYTlNPYmplY3RfEA9OU0tleWVkQXJjaGl2 - ZXLRFxhUcm9vdIABCBEaIy0yNztBSE5bYouNj5SfqLCzvM7R1gAAAAAAAAEBAAAAAAAA - ABkAAAAAAAAAAAAAAAAAAADY - - ANSIGreenColor - - YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS - AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECUw - LjY1MDk4MDQxMyAwLjg5MDE5NjA4NSAwLjE3NjQ3MDU5MjYAEAGAAtIQERITWiRjbGFz - c25hbWVYJGNsYXNzZXNXTlNDb2xvcqISFFhOU09iamVjdF8QD05TS2V5ZWRBcmNoaXZl - ctEXGFRyb290gAEIERojLTI3O0FITltiioyOk56nr7K7zdDVAAAAAAAAAQEAAAAAAAAA - GQAAAAAAAAAAAAAAAAAAANc= - - ANSIMagentaColor - - YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS - AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECYw - Ljk4MDM5MjE1OCAwLjE0NTA5ODA0NTUgMC40NTA5ODAzOTUxABABgALSEBESE1okY2xh - c3NuYW1lWCRjbGFzc2VzV05TQ29sb3KiEhRYTlNPYmplY3RfEA9OU0tleWVkQXJjaGl2 - ZXLRFxhUcm9vdIABCBEaIy0yNztBSE5bYouNj5SfqLCzvM7R1gAAAAAAAAEBAAAAAAAA - ABkAAAAAAAAAAAAAAAAAAADY - - ANSIRedColor - - YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS - AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw - Ljg5ODAzOTIyMTggMC4xMzMzMzMzNDAzIDAuMTMzMzMzMzQwMwAQAYAC0hAREhNaJGNs - YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp - dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA - AAAZAAAAAAAAAAAAAAAAAAAA2Q== - - ANSIWhiteColor - - YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS - AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw - Ljk0OTAxOTYxMDkgMC45NDkwMTk2MTA5IDAuOTQ5MDE5NjEwOQAQAYAC0hAREhNaJGNs - YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp - dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA - AAAZAAAAAAAAAAAAAAAAAAAA2Q== - - ANSIYellowColor - - YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS - AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw - Ljk4ODIzNTI5NDggMC41ODQzMTM3NTAzIDAuMTE3NjQ3MDU5MwAQAYAC0hAREhNaJGNs - YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp - dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA - AAAZAAAAAAAAAAAAAAAAAAAA2Q== - - BackgroundBlur - 0.0 - BackgroundColor - - YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS - AAGGoKMHCA9VJG51bGzTCQoLDA0OV05TV2hpdGVcTlNDb2xvclNwYWNlViRjbGFzc0Iw - ABADgALSEBESE1okY2xhc3NuYW1lWCRjbGFzc2VzV05TQ29sb3KiEhRYTlNPYmplY3Rf - EA9OU0tleWVkQXJjaGl2ZXLRFxhUcm9vdIABCBEaIy0yNztBSFBdZGdpa3B7hIyPmKqt - sgAAAAAAAAEBAAAAAAAAABkAAAAAAAAAAAAAAAAAAAC0 - - BlinkText - - CursorBlink - - CursorColor - - YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS - AAGGoKMHCA9VJG51bGzTCQoLDA0OV05TV2hpdGVcTlNDb2xvclNwYWNlViRjbGFzc0sw - LjMwMjQxOTM2ABADgALSEBESE1okY2xhc3NuYW1lWCRjbGFzc2VzV05TQ29sb3KiEhRY - TlNPYmplY3RfEA9OU0tleWVkQXJjaGl2ZXLRFxhUcm9vdIABCBEaIy0yNztBSFBdZHBy - dHmEjZWYobO2uwAAAAAAAAEBAAAAAAAAABkAAAAAAAAAAAAAAAAAAAC9 - - Font - - YnBsaXN0MDDUAQIDBAUGGBlYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS - AAGGoKQHCBESVSRudWxs1AkKCwwNDg8QVk5TU2l6ZVhOU2ZGbGFnc1ZOU05hbWVWJGNs - YXNzI0AqAAAAAAAAEBCAAoADVk1vbmFjb9ITFBUWWiRjbGFzc25hbWVYJGNsYXNzZXNW - TlNGb250ohUXWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hpdmVy0RobVHJvb3SAAQgRGiMt - Mjc8QktSW2JpcnR2eH+Ej5ifoqu9wMUAAAAAAAABAQAAAAAAAAAcAAAAAAAAAAAAAAAA - AAAAxw== - - FontAntialias - - FontHeightSpacing - 1.1 - FontWidthSpacing - 1 - ProfileCurrentVersion - 1.00 - SelectionColor - - YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS - AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw - LjMzMzMzMzMzMzMgMC4zMzMzMzMzMzMzIDAuMzMzMzMzMzMzMwAQAYAC0hAREhNaJGNs - YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp - dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA - AAAZAAAAAAAAAAAAAAAAAAAA2Q== - - ShowActiveProcessInTitle - - ShowCommandKeyInTitle - - ShowDimensionsInTitle - - ShowShellCommandInTitle - - ShowTTYNameInTitle - - ShowWindowSettingsNameInTitle - - TextBoldColor - - YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS - AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw - LjczMzMzMzM0OTIgMC43MzMzMzMzNDkyIDAuNzMzMzMzMzQ5MgAQAYAC0hAREhNaJGNs - YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp - dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA - AAAZAAAAAAAAAAAAAAAAAAAA2Q== - - TextColor - - YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS - AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NGMSAx - IDEAEAGAAtIQERITWiRjbGFzc25hbWVYJGNsYXNzZXNXTlNDb2xvcqISFFhOU09iamVj - dF8QD05TS2V5ZWRBcmNoaXZlctEXGFRyb290gAEIERojLTI3O0FITltiaWttcn2GjpGa - rK+0AAAAAAAAAQEAAAAAAAAAGQAAAAAAAAAAAAAAAAAAALY= - - UseBrightBold - - WindowTitle - - name - Mathias - shellExitAction - 2 - type - Window Settings - - diff --git a/init/Solarized Dark xterm-256color.terminal b/init/Solarized Dark xterm-256color.terminal new file mode 100644 index 0000000..46f179d --- /dev/null +++ b/init/Solarized Dark xterm-256color.terminal @@ -0,0 +1,160 @@ + + + + + BackgroundColor + + YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS + AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECgw + LjAxNTkyNDQwNTMxIDAuMTI2NTIwOTE2OCAwLjE1OTY5NjAxMjcAEAGAAtIQERITWiRj + bGFzc25hbWVYJGNsYXNzZXNXTlNDb2xvcqISFFhOU09iamVjdF8QD05TS2V5ZWRBcmNo + aXZlctEXGFRyb290gAEIERojLTI3O0FITltijY+RlqGqsrW+0NPYAAAAAAAAAQEAAAAA + AAAAGQAAAAAAAAAAAAAAAAAAANo= + + BlinkText + + CursorColor + + YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS + AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw + LjQ0MDU4MDI0ODggMC41MDk2MjkzMDkyIDAuNTE2ODU3OTgxNwAQAYAC0hAREhNaJGNs + YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp + dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA + AAAZAAAAAAAAAAAAAAAAAAAA2Q== + + Font + + YnBsaXN0MDDUAQIDBAUGGBlYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS + AAGGoKQHCBESVSRudWxs1AkKCwwNDg8QVk5TU2l6ZVhOU2ZGbGFnc1ZOU05hbWVWJGNs + YXNzI0AqAAAAAAAAEBCAAoADXU1lbmxvLVJlZ3VsYXLSExQVFlokY2xhc3NuYW1lWCRj + bGFzc2VzVk5TRm9udKIVF1hOU09iamVjdF8QD05TS2V5ZWRBcmNoaXZlctEaG1Ryb290 + gAEIERojLTI3PEJLUltiaXJ0dniGi5afpqmyxMfMAAAAAAAAAQEAAAAAAAAAHAAAAAAA + AAAAAAAAAAAAAM4= + + FontAntialias + + FontHeightSpacing + 1.1000000000000001 + FontWidthSpacing + 1 + ProfileCurrentVersion + 2.02 + SelectionColor + + YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS + AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECgw + LjAzOTM4MDczNjY1IDAuMTYwMTE2NDYzOSAwLjE5ODMzMjc1NjgAEAGAAtIQERITWiRj + bGFzc25hbWVYJGNsYXNzZXNXTlNDb2xvcqISFFhOU09iamVjdF8QD05TS2V5ZWRBcmNo + aXZlctEXGFRyb290gAEIERojLTI3O0FITltijY+RlqGqsrW+0NPYAAAAAAAAAQEAAAAA + AAAAGQAAAAAAAAAAAAAAAAAAANo= + + ShowWindowSettingsNameInTitle + + TerminalType + xterm-256color + TextBoldColor + + YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS + AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECYw + LjUwNTk5MTkzNTcgMC41NjQ4NTgzNzcgMC41NjM2MzY1NDE0ABABgALSEBESE1okY2xh + c3NuYW1lWCRjbGFzc2VzV05TQ29sb3KiEhRYTlNPYmplY3RfEA9OU0tleWVkQXJjaGl2 + ZXLRFxhUcm9vdIABCBEaIy0yNztBSE5bYouNj5SfqLCzvM7R1gAAAAAAAAEBAAAAAAAA + ABkAAAAAAAAAAAAAAAAAAADY + + TextColor + + YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS + AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw + LjQ0MDU4MDI0ODggMC41MDk2MjkzMDkyIDAuNTE2ODU3OTgxNwAQAYAC0hAREhNaJGNs + YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp + dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA + AAAZAAAAAAAAAAAAAAAAAAAA2Q== + + UseBrightBold + + blackColour + + BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm + ZmZmg7JNIT2DkvUjPoO+F0s+AYY= + + blueColour + + BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm + ZmZmgyqcAj6DtOHsPoO+RUg/AYY= + + brightBlackColour + + BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm + ZmZmg+ZzgjyDs44BPoNahyM+AYY= + + brightBlueColour + + BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm + ZmZmg7yT4T6DEXcCP4POUAQ/AYY= + + brightCyanColour + + BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm + ZmZmg7CIAT+Dj5oQP4N8ShA/AYY= + + brightGreenColour + + BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm + ZmZmgzyujT6DFZy2PoOYFsQ+AYY= + + brightMagentaColour + + BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm + ZmZmgxMjsj6D+uazPoNkyTc/AYY= + + brightRedColour + + BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm + ZmZmgyfkPT+D/15aPoMgl5Y9AYY= + + brightWhiteColour + + BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm + ZmZmg49LfT+D0Dt1P4MGM10/AYY= + + brightYellowColour + + BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm + ZmZmg1MTpj6DeHnQPoPQg+A+AYY= + + cyanColour + + BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm + ZmZmg4VRFj6DfyESP4PkZwY/AYY= + + greenColour + + BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm + ZmZmg9lI5j6DIYkKP4PVjKU8AYY= + + magentaColour + + BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm + ZmZmg/4CRz+DBTzdPYMgzt4+AYY= + + name + Solarized Dark xterm-256color + redColour + + BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm + ZmZmg6i7UT+DUATePYMl2hA+AYY= + + type + Window Settings + whiteColour + + BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm + ZmZmgzqGaj+D2tdjP4NYPUw/AYY= + + yellowColour + + BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm + ZmZmg0DAJT+DB17vPoM4Y8A8AYY= + + + diff --git a/init/Mathias.itermcolors b/init/Solarized Dark.itermcolors similarity index 58% rename from init/Mathias.itermcolors rename to init/Solarized Dark.itermcolors index 5357570..d630a40 100644 --- a/init/Mathias.itermcolors +++ b/init/Solarized Dark.itermcolors @@ -1,214 +1,214 @@ - + Ansi 0 Color Blue Component - 0.0 + 0.19370138645172119 Green Component - 0.0 + 0.15575926005840302 Red Component 0.0 Ansi 1 Color Blue Component - 0.13333334028720856 + 0.14145714044570923 Green Component - 0.13333334028720856 + 0.10840655118227005 Red Component - 0.89803922176361084 + 0.81926977634429932 Ansi 10 Color Blue Component - 0.3333333432674408 + 0.38298487663269043 Green Component - 1 + 0.35665956139564514 Red Component - 0.3333333432674408 + 0.27671992778778076 Ansi 11 Color Blue Component - 0.3333333432674408 + 0.43850564956665039 Green Component - 1 + 0.40717673301696777 Red Component - 1 + 0.32436618208885193 Ansi 12 Color Blue Component - 1 + 0.51685798168182373 Green Component - 0.3333333432674408 + 0.50962930917739868 Red Component - 0.3333333432674408 + 0.44058024883270264 Ansi 13 Color Blue Component - 1 + 0.72908437252044678 Green Component - 0.3333333432674408 + 0.33896297216415405 Red Component - 1 + 0.34798634052276611 Ansi 14 Color Blue Component - 1 + 0.56363654136657715 Green Component - 1 + 0.56485837697982788 Red Component - 0.3333333432674408 + 0.50599193572998047 Ansi 15 Color Blue Component - 1 + 0.86405980587005615 Green Component - 1 + 0.95794391632080078 Red Component - 1 + 0.98943418264389038 Ansi 2 Color Blue Component - 0.17647059261798859 + 0.020208755508065224 Green Component - 0.89019608497619629 + 0.54115492105484009 Red Component - 0.65098041296005249 + 0.44977453351020813 Ansi 3 Color Blue Component - 0.11764705926179886 + 0.023484811186790466 Green Component - 0.58431375026702881 + 0.46751424670219421 Red Component - 0.98823529481887817 + 0.64746475219726562 Ansi 4 Color Blue Component - 1 + 0.78231418132781982 Green Component - 0.55294120311737061 + 0.46265947818756104 Red Component - 0.76862746477127075 + 0.12754884362220764 Ansi 5 Color Blue Component - 0.45098039507865906 + 0.43516635894775391 Green Component - 0.14509804546833038 + 0.10802463442087173 Red Component - 0.98039215803146362 + 0.77738940715789795 Ansi 6 Color Blue Component - 0.94117647409439087 + 0.52502274513244629 Green Component - 0.85098040103912354 + 0.57082360982894897 Red Component - 0.40392157435417175 + 0.14679534733295441 Ansi 7 Color Blue Component - 0.94901961088180542 + 0.79781103134155273 Green Component - 0.94901961088180542 + 0.89001238346099854 Red Component - 0.94901961088180542 + 0.91611063480377197 Ansi 8 Color Blue Component - 0.33333333333333331 + 0.15170273184776306 Green Component - 0.33333333333333331 + 0.11783610284328461 Red Component - 0.33333333333333331 + 0.0 Ansi 9 Color Blue Component - 0.3333333432674408 + 0.073530435562133789 Green Component - 0.3333333432674408 + 0.21325300633907318 Red Component - 1 + 0.74176257848739624 Background Color Blue Component - 0.0 + 0.15170273184776306 Green Component - 0.0 + 0.11783610284328461 Red Component 0.0 Bold Color Blue Component - 1 + 0.56363654136657715 Green Component - 1 + 0.56485837697982788 Red Component - 1 + 0.50599193572998047 Cursor Color Blue Component - 0.73333334922790527 + 0.51685798168182373 Green Component - 0.73333334922790527 + 0.50962930917739868 Red Component - 0.73333334922790527 + 0.44058024883270264 Cursor Text Color Blue Component - 1 + 0.19370138645172119 Green Component - 1 + 0.15575926005840302 Red Component - 1 + 0.0 Foreground Color Blue Component - 0.73333334922790527 + 0.51685798168182373 Green Component - 0.73333334922790527 + 0.50962930917739868 Red Component - 0.73333334922790527 + 0.44058024883270264 Selected Text Color Blue Component - 0.94901961088180542 + 0.56363654136657715 Green Component - 0.94901961088180542 + 0.56485837697982788 Red Component - 0.94901961088180542 + 0.50599193572998047 Selection Color Blue Component - 0.33333333333333331 + 0.19370138645172119 Green Component - 0.33333333333333331 + 0.15575926005840302 Red Component - 0.33333333333333331 + 0.0