colonelpanic/dotfiles
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tweaks.

Browse Source
This commit is contained in:
Ivan Malison 2014-11-04 17:40:25 -08:00
parent 8963390c39
commit 21f0ae4d1f
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
init.el
View File

@ -18,7 +18,6 @@
(setq custom-file "~/.emacs.d/custom.el") (setq custom-file "~/.emacs.d/custom.el")
(when (file-exists-p custom-file) (load custom-file)) (when (file-exists-p custom-file) (load custom-file))
(add-to-list 'load-path "~/Projects/scala-mode2")
;; ============================================================================= ;; =============================================================================
;; ELPA/package.el/MELPA ;; ELPA/package.el/MELPA
@ -35,19 +34,19 @@
(defvar packages-appearance (defvar packages-appearance
'(monokai-theme solarized-theme zenburn-theme base16-theme molokai-theme '(monokai-theme solarized-theme zenburn-theme base16-theme molokai-theme
tango-2-theme color-theme-sanityinc-tomorrow smart-mode-line ansi-color tango-2-theme color-theme-sanityinc-tomorrow smart-mode-line ansi-color
rainbow-delimiters)) rainbow-delimiters))
(defvar packages-essential (defvar packages-essential
'(epl use-package projectile flycheck ace-jump-mode helm helm-projectile popup smex '(epl use-package projectile flycheck ace-jump-mode helm helm-projectile popup
magit auto-complete ido-ubiquitous mo-git-blame multiple-cursors flx-ido smex magit auto-complete ido-ubiquitous mo-git-blame multiple-cursors
yasnippet cl-lib)) yasnippet cl-lib flx-ido))
(defvar packages-other (defvar packages-other
'(thingatpt+ latex-preview-pane auctex paredit inf-ruby undo-tree '(thingatpt+ latex-preview-pane auctex paredit inf-ruby undo-tree
exec-path-from-shell slime string-inflection yaml-mode sgml-mode dired+ exec-path-from-shell slime string-inflection yaml-mode sgml-mode
ctags ctags-update helm-gtags hackernews evil gitconfig-mode dired+ ctags ctags-update helm-gtags hackernews gitconfig-mode
aggressive-indent imenu+ weechat)) aggressive-indent imenu+ weechat evil))
(defvar packages-python '(jedi pymacs pytest sphinx-doc)) (defvar packages-python '(jedi pymacs pytest sphinx-doc))
(defvar packages-scala '(scala-mode2 ensime)) (defvar packages-scala '(scala-mode2 ensime))
@ -194,7 +193,7 @@
;; Scala ;; Scala
;; ============================================================================= ;; =============================================================================
(require 'ensime) (add-to-list 'load-path "~/Projects/scala-mode2")
(require 'scala-mode2) (require 'scala-mode2)
(add-hook 'scala-mode-hook 'ensime-scala-mode-hook) (add-hook 'scala-mode-hook 'ensime-scala-mode-hook)
(add-hook 'scala-mode-hook '(lambda () (add-hook 'scala-mode-hook '(lambda ()
@ -215,6 +214,8 @@
(setq js-indent-level 2) (setq js-indent-level 2)
(add-to-list 'auto-mode-alist '("\\.js$" . js2-mode))
(add-hook 'js-mode-hook (lambda () (tern-mode t))) (add-hook 'js-mode-hook (lambda () (tern-mode t)))
(eval-after-load 'tern (eval-after-load 'tern
'(progn '(progn