Hopefully fixed iterm2 solarized installation

Fixed git daemon Switched to java 8
fmoda3 · Oct 22, 2015 · 109a17b · 109a17b
1 parent 8dd1005
commit 109a17b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/Rakefile b/Rakefile
@@ -325,6 +325,7 @@ def apply_theme_to_iterm_profile_idx(index, color_scheme_path)
   values.flatten.each { |entry| run %{ /usr/libexec/PlistBuddy -c "Delete :'New Bookmarks':#{index}:'#{entry}'" ~/Library/Preferences/com.googlecode.iterm2.plist } }
 
   run %{ /usr/libexec/PlistBuddy -c "Merge '#{color_scheme_path}' :'New Bookmarks':#{index}" ~/Library/Preferences/com.googlecode.iterm2.plist }
+  run %{ defaults read com.googlecode.iterm2 }
 end
 
 def success_msg(action)

diff --git a/git/gitconfig b/git/gitconfig
@@ -91,7 +91,7 @@
   mt = mergetool                    # fire up the merge tool
 
   # serve the repo
-  serve = !git daemon --reuseaddr --verbose --base-path=. --export-all ./.git
+  serve = !git daemon --reuseaddr --verbose --base-path=. --export-all --informative-errors
 
   # stash
   ss = stash                        # stash changes

diff --git a/zsh/config/zshenv b/zsh/config/zshenv
@@ -74,4 +74,4 @@ fi
 # Java & Maven
 export JAVA_OPTS="-Xms2048m -Xmx2048m -XX:MaxPermSize=512m -XX:PermSize=512m -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:+UseCodeCacheFlushing"
 export MAVEN_OPTS=$JAVA_OPTS
-export JAVA_HOME=$(/usr/libexec/java_home -v '1.7*')
+export JAVA_HOME=$(/usr/libexec/java_home -v '1.8*')/jre