aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Odersky <jakob@odersky.com>2016-12-04 13:30:40 -0800
committerJakob Odersky <jakob@odersky.com>2016-12-04 13:30:40 -0800
commit642a66c7037d305c814a8a901c2ff87e31dc8f92 (patch)
tree80dfa3470881728bacef868d3c10b7fa5f846bae
parentecd10ddbf7e2f9bcdb9f12874d753d75cf4e1afc (diff)
downloaddotfiles-642a66c7037d305c814a8a901c2ff87e31dc8f92.tar.gz
dotfiles-642a66c7037d305c814a8a901c2ff87e31dc8f92.tar.bz2
dotfiles-642a66c7037d305c814a8a901c2ff87e31dc8f92.zip
Update emacs packages
-rw-r--r--home/.emacs.d/config/lang.el5
-rw-r--r--home/.emacs.d/config/navigation.el5
2 files changed, 8 insertions, 2 deletions
diff --git a/home/.emacs.d/config/lang.el b/home/.emacs.d/config/lang.el
index 9393b73..8e1ac7b 100644
--- a/home/.emacs.d/config/lang.el
+++ b/home/.emacs.d/config/lang.el
@@ -43,6 +43,7 @@
;; ENhanced Scala Interaction Mode for text Editors
(use-package ensime
+ :pin melpa
:commands ensime ensime-mode
:init
:config
@@ -61,7 +62,9 @@
(use-package js3-mode
:mode "\\.js\\'")
+;;; Haskell
+(use-package haskell-mode)
-;; Docker
+;;; Docker
(use-package dockerfile-mode
:mode "\\Dockerfile\\'")
diff --git a/home/.emacs.d/config/navigation.el b/home/.emacs.d/config/navigation.el
index c42d59e..df0e176 100644
--- a/home/.emacs.d/config/navigation.el
+++ b/home/.emacs.d/config/navigation.el
@@ -12,7 +12,6 @@
helm-buffers-fuzzy-matching t
helm-recentf-fuzzy-match t
helm-ff-file-name-history-use-recentf t))
-
:bind (("C-h a" . helm-apropos)
("C-x b" . helm-buffers-list)
("C-x C-f" . helm-find-files)
@@ -39,6 +38,10 @@
:bind (("C-x p" . helm-projectile)
("C-x P" . helm-projectile-grep)))
+(use-package popup-imenu
+ :commands popup-imenu
+ :bind ("M-i" . popup-imenu))
+
(use-package projectile
:defer t ; loading is ensured by helm-projectile
:init