Uncommented some bash completions, and other cleanup

JKrag · Aug 21, 2015 · dc116f2 · dc116f2
1 parent a5e5990
commit dc116f2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/.bash_profile b/.bash_profile
@@ -18,9 +18,13 @@ if [[ "$TERM_PROGRAM" != "DTerm" ]]; then
 	if [ -f `brew --prefix`/etc/bash_completion ]; then
 		. `brew --prefix`/etc/bash_completion
 	fi
-	source ~/.hg_bash_completion
+	#source ~/.hg_bash_completion
 	[[ $- == *i* ]]   &&   . /Users/jankrag/Documents/github/git-prompt/git-prompt.sh
 fi
+#if [ -f ~/.config/exercism/exercism_completion.bash ]; then
+#    . ~/.config/exercism/exercism_completion.bash
+#fi
+
 
 #if [ -f /Users/jankrag/Documents/github/git-prompt/git-prompt.sh ]; then
 #    . /Users/jankrag/Documents/github/git-prompt/git-prompt.sh

diff --git a/.profile b/.profile
@@ -9,6 +9,9 @@ export HISTSIZE=1000
 shopt -s histappend #tell the shell to always append the history to the HISTFILE.
 shopt -s histverify # verify command substitutions before the shell executes them
 export PROMPT_COMMAND="$PROMPT_COMMAND;history -a"
+
+#set -o vi
+
 alias git="git-achievements"
 
 alias ll='ls -alF'
@@ -82,4 +85,5 @@ alias watchdir='watch -n .5 ls -la'
 alias catc='pygmentize -g'
 
 #alias my own clone of 'q' command for testing changes before sending pull-request, but still allowing use of the brew installed one
-alias jq='~/Documents/github/q/q'
+alias jq='~/Documents/github/q/q'
+
diff --git a/tools_installed_on_my_mac.md b/tools_installed_on_my_mac.md
@@ -66,3 +66,4 @@ sbt
 smlnj
 sqlite
 tig
+ag (the silver surfer - ack/grep replacement)
-Original file line number
+Diff line change
@@ Expand Up / @@ -66,3 +66,4 @@ sbt @@
     smlnj
     sqlite
     tig
+    ag (the silver surfer - ack/grep replacement)