Merge branch 'ursa_minor'

3 files changed, 54 insertions, 0 deletions

diff --git a/bash/.bashrc b/bash/.bashrc
index 1a634db..8822776 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -16,6 +16,10 @@ alias rtv='rtv --enable-media'
 
 alias sloc='sloccount'
 
+alias t='t --task-dir ~/tasks'
+
+alias fm='vifm'
+
 PS1='[\u@\h \W]\$ '
 
 export GPG_TTY=$(tty)
@@ -29,3 +33,21 @@ export IRCNAME="tje"
 export IRCSERVER="chat.freenode.net"
 
 alias word=wordgrinder
+
+GIT_PROMPT_ONLY_IN_REPO=1
+GIT_PROMPT_IGNORE_SUBMODULES=1
+# GIT_PROMPT_FETCH_REMOTE_STATUS=0   # uncomment to avoid fetching remote status
+GIT_PROMPT_SHOW_UPSTREAM=1 # uncomment to show upstream tracking branch
+# GIT_PROMPT_SHOW_UNTRACKED_FILES=all # can be no, normal or all; determines counting of untracked files
+# GIT_PROMPT_SHOW_CHANGED_FILES_COUNT=0 # uncomment to avoid printing the number of changed files
+# GIT_PROMPT_STATUS_COMMAND=gitstatus_pre-1.7.10.sh # uncomment to support Git older than 1.7.10
+# GIT_PROMPT_START=...    # uncomment for custom prompt start sequence
+# GIT_PROMPT_END=...      # uncomment for custom prompt end sequence
+
+# as last entry source the gitprompt script
+# GIT_PROMPT_THEME=Custom # use custom theme specified in file GIT_PROMPT_THEME_FILE (default ~/.git-prompt-colors.sh)
+GIT_PROMPT_THEME="Custom"; # use theme optimized for solarized color scheme
+GIT_PROMPT_THEME_FILE=~/.git-prompt-colors.sh
+
+source /home/tje/.git-prompt/gitprompt.sh
+
diff --git a/bash/.git-prompt b/bash/.git-prompt
new file mode 160000
+Subproject 19c8def6a90d72f2a99d781752271126b1b9ff6
diff --git a/bash/.git-prompt-colors.sh b/bash/.git-prompt-colors.sh
new file mode 100644
index 0000000..ff8a38a
--- /dev/null
+++ b/bash/.git-prompt-colors.sh
@@ -0,0 +1,32 @@
+# This is an alternative approach. Single line minimalist in git repo.
+override_git_prompt_colors() {
+  GIT_PROMPT_THEME_NAME="Custom"
+
+  function prompt_callback {
+    local PS1="$(gp_truncate_pwd)"
+    gp_set_window_title "$PS1"
+  }
+
+  Time12a="\$(date +%H:%M:%S)"
+  PathShort="\W";
+
+  GIT_PROMPT_PREFIX="["
+  GIT_PROMPT_SUFFIX="]"
+  GIT_PROMPT_SEPARATOR=" "
+  GIT_PROMPT_STAGED="${Red}●${ResetColor}"
+  GIT_PROMPT_CONFLICTS="${Red}×${ResetColor}"
+  GIT_PROMPT_CHANGED="${Blue}+${ResetColor}"
+  GIT_PROMPT_UNTRACKED="${Cyan}─${ResetColor}"
+  GIT_PROMPT_STASHED="${BoldBlue}≡${ResetColor}"
+  GIT_PROMPT_CLEAN="${BoldGreen}✔${ResetColor}"
+
+  GIT_PROMPT_COMMAND_OK="${Green}✔"
+  GIT_PROMPT_COMMAND_FAIL="${Red}✘"
+
+  GIT_PROMPT_START_USER="${Cyan}${PathShort}${ResetColor}"
+  GIT_PROMPT_END_USER="${ResetColor} $ "
+  GIT_PROMPT_END_ROOT="${BoldRed} # "
+
+}
+
+reload_git_prompt_colors "Custom"