From ef64a1129a1355c4c24f51e1ab147106013744b7 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Wed, 8 Oct 2014 04:03:32 -0700
Subject: [PATCH] small tweaks here and there, add .sbt with ensime plugin
 enabled by default.

---
 .gitignore                               |  5 ++++-
 dotfiles/emacs.d                         |  2 +-
 dotfiles/lib/shellrc.sh                  |  2 ++
 dotfiles/lib/shellrc/aliases.sh          |  1 +
 dotfiles/lib/shellrc/functions.sh        | 12 ++++++------
 dotfiles/lib/shellrc/remote_clipboard.sh |  3 ++-
 dotfiles/sbt/0.13/plugins/plugins.sbt    |  3 +++
 setup.sh                                 | 10 +---------
 8 files changed, 20 insertions(+), 18 deletions(-)
 create mode 100644 dotfiles/sbt/0.13/plugins/plugins.sbt

diff --git a/.gitignore b/.gitignore
index b31b93a4..d1ce340b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
 .ropeproject
 dotfiles/vim/bundle/*
-dotfiles/vim/.netrwhist
\ No newline at end of file
+dotfiles/vim/.netrwhist
+dotfiles/sbt/0.13/plugins/project/
+dotfiles/sbt/0.13/plugins/target/
+dotfiles/sbt/boot/
\ No newline at end of file
diff --git a/dotfiles/emacs.d b/dotfiles/emacs.d
index 6b66ec5a..bb180725 160000
--- a/dotfiles/emacs.d
+++ b/dotfiles/emacs.d
@@ -1 +1 @@
-Subproject commit 6b66ec5a6a2da6314ad0c9758d02d5486125d706
+Subproject commit bb1807256fd065252eb8c90d2f291e07d042262e
diff --git a/dotfiles/lib/shellrc.sh b/dotfiles/lib/shellrc.sh
index eddbd2f7..9d3da47c 100644
--- a/dotfiles/lib/shellrc.sh
+++ b/dotfiles/lib/shellrc.sh
@@ -21,5 +21,7 @@ if is_osx; then
     export CPPFLAGS=-Qunused-arguments
 fi
 
+add_to_back_of_path "$(dotfiles_directory)/resources/python"
+
 # Access gnu man pages.
 MANPATH="$HOMEBREW_PREFIX/opt/coreutils/libexec/gnuman:$MANPATH"
diff --git a/dotfiles/lib/shellrc/aliases.sh b/dotfiles/lib/shellrc/aliases.sh
index dd2f8c0d..c0fd6444 100644
--- a/dotfiles/lib/shellrc/aliases.sh
+++ b/dotfiles/lib/shellrc/aliases.sh
@@ -6,6 +6,7 @@ alias tmux_cb_to_remote_cb='tmux saveb - | linux_nc_paste_to_remote_clipboard'
 alias timestamp='date +%s'
 alias fn='find . -name '
 alias prj='cd ~/Projects'
+alias tox27='tox -e py27 --'
 alias reload_tmux='tmux source-file ~/.tmux.conf'
 
 # enables the sudoing of aliases.
diff --git a/dotfiles/lib/shellrc/functions.sh b/dotfiles/lib/shellrc/functions.sh
index 0213bde8..659b26c7 100644
--- a/dotfiles/lib/shellrc/functions.sh
+++ b/dotfiles/lib/shellrc/functions.sh
@@ -1,5 +1,10 @@
+function dotfiles_directory() {
+    echo $(dirname `readlink -f ~/.zshrc | xargs dirname`)
+}
+
+
 function go2dotfiles() {
-    cd $(dirname `readlink -f ~/.zshrc | xargs dirname`)
+    cd $(dotfiles_directory)
 }
 
 function update_dotfiles() {
@@ -202,11 +207,6 @@ function pip_package_location() {
     pip show $1 | grep Location | get_cols 2
 }
 
-function make_ensime() {
-    echo '\n\naddSbtPlugin("org.ensime" % "ensime-sbt-cmd" % "0.1.1")' >> project/plugins.sbt
-    sbt "ensime generate"
-}
-
 function set_modifier_keys_for_vendor_product_id() {
     defaults -currentHost write -g com.apple.keyboard.modifiermapping.$1-0 '(
 {
diff --git a/dotfiles/lib/shellrc/remote_clipboard.sh b/dotfiles/lib/shellrc/remote_clipboard.sh
index b536af78..636b8558 100644
--- a/dotfiles/lib/shellrc/remote_clipboard.sh
+++ b/dotfiles/lib/shellrc/remote_clipboard.sh
@@ -25,8 +25,9 @@ function remote_os_copy() {
     if is_osx;
     then
         _osx_nc_paste_to_remote_clipboard
+
     else
-        _linux_nc_paste_to_remote_clipboard
+        _linux_nc_write_remote_clipboard
     fi
 }
 
diff --git a/dotfiles/sbt/0.13/plugins/plugins.sbt b/dotfiles/sbt/0.13/plugins/plugins.sbt
new file mode 100644
index 00000000..fc68bfc7
--- /dev/null
+++ b/dotfiles/sbt/0.13/plugins/plugins.sbt
@@ -0,0 +1,3 @@
+resolvers += Resolver.sonatypeRepo("snapshots")
+
+addSbtPlugin("org.ensime" % "ensime-sbt" % "0.1.5-SNAPSHOT")
diff --git a/setup.sh b/setup.sh
index 35fe51a0..451ab5d8 100755
--- a/setup.sh
+++ b/setup.sh
@@ -34,14 +34,6 @@ function symlink_dotfiles() {
 }
 
 
-function symlink_dotfiles_prompt() {
-    read -p "Symlinking files from $DOTFILES_DIRECTORY. This ? (y/n) " -n 1
-    if [[ $REPLY =~ ^[Yy]$ ]]; then
-        echo
-	symlink_dotfiles
-    fi
-}
-
 function apt-get() {
     INSTALL="sudo apt-get -y install"
     $INSTALL zsh
@@ -95,7 +87,7 @@ function setup() {
                 osx_config
                 ;;
             s)
-                symlink_dotfiles_prompt
+                symlink_dotfiles -o
                 ;;
             p)
                 install_python_packages -h