Local updates

diff --git a/.gitignore b/.gitignore
index 1377554ebea6f98a2c748183bc5a96852af12ac2..d38c149cc61d33df6db42048970c41f73bd193fd 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 *.swp
+*~

diff --git a/dotemacs b/dotemacs
index 0699c416f25ecc55ae496884bdd2949c854997a3..d30ed9fafb1cd7f4aa25524325feabcd9a4d4d14 100755 (executable)
--- a/dotemacs
+++ b/dotemacs
@@ -4,7 +4,6 @@
 ; Load Path
 (add-to-list 'load-path "~/.emacs.d/elisp")
 
-
 ; UI customizations
 (display-time)
 (if (fboundp 'tool-bar-mode) (tool-bar-mode -1))
@@ -16,8 +15,8 @@
 (setq ring-bell-function 'ignore)
 
 ; Tramp
-(require 'tramp)
-(setq tramp-default-method "ssh")
+;(require 'tramp)
+;(setq tramp-default-method "ssh")
 
 (defun set-dark-theme ()
   (interactive)
@@ -84,14 +83,30 @@
   (let ((inhibit-read-only t))
     (erase-buffer)))
 
+;; MELPA
+(require 'package)
+(package-initialize)
+(add-to-list 'package-archives
+            '("melpa" . "http://melpa.milkbox.net/packages/") t)
+
+(when (not package-archive-contents)
+  (package-refresh-contents))
+
+(exec-path-from-shell-initialize)
+
+;; Scala Ensime
+(require 'ensime)
+(add-hook 'scala-mode-hook 'ensime-scala-mode-hook)
+
+
 ; Slime Config
-(setq inferior-lisp-program "/usr/local/bin/sbcl")
-(add-to-list 'load-path "~/Projects/slime")
-(require 'slime-autoloads)
-(slime-setup '(slime-repl slime-banner slime-references))
-
-(add-hook 'slime-mode-hook
-         (lambda ()
-           (unless (slime-connected-p)
-             (save-excursion (slime)))))
+;(setq inferior-lisp-program "/usr/local/bin/sbcl")
+;(add-to-list 'load-path "~/Projects/slime")
+;(require 'slime-autoloads)
+;(slime-setup '(slime-repl slime-banner slime-references))
+
+;(add-hook 'slime-mode-hook
+;        (lambda ()
+;          (unless (slime-connected-p)
+;            (save-excursion (slime)))))
 

diff --git a/dotvimrc b/dotvimrc
index 8d85e4c732867c8e4a38277e70297f65ddcaafd8..9744db7c610cabb3562f6583752eca91790673c9 100644 (file)
--- a/dotvimrc
+++ b/dotvimrc
@@ -28,6 +28,7 @@ let mapleader=","
 let g:CommandTAcceptSelectionTabMap='<CR>'
 
 map <leader>f :CommandT<cr>
+map <leader>a :NERDTreeToggle<cr>
 
 " Setup project/team-specific configurations
 function! SetupEnvironment()