aboutsummaryrefslogtreecommitdiff
path: root/home/.emacs.d
diff options
context:
space:
mode:
authorJakob Odersky <jakob@odersky.com>2016-03-29 21:02:40 -0700
committerJakob Odersky <jakob@odersky.com>2016-03-29 21:02:40 -0700
commitc55b9ac1446758ddb3f15f3ff37cf4361a8a7d4b (patch)
tree827436d7720f002b97f532cfc85e8f4d1f576e97 /home/.emacs.d
parent4a7f2ef25fbed1e98b63346574eef2959037ab6b (diff)
downloaddotfiles-c55b9ac1446758ddb3f15f3ff37cf4361a8a7d4b.tar.gz
dotfiles-c55b9ac1446758ddb3f15f3ff37cf4361a8a7d4b.tar.bz2
dotfiles-c55b9ac1446758ddb3f15f3ff37cf4361a8a7d4b.zip
Update keymap
Diffstat (limited to 'home/.emacs.d')
-rw-r--r--home/.emacs.d/init.el35
1 files changed, 22 insertions, 13 deletions
diff --git a/home/.emacs.d/init.el b/home/.emacs.d/init.el
index 13f7edd..39a1e11 100644
--- a/home/.emacs.d/init.el
+++ b/home/.emacs.d/init.el
@@ -47,8 +47,10 @@
(when (not package-archive-contents)
(package-refresh-contents))
+
;; c style
(setq c-default-style "linux")
+
(use-package helm
:init (progn
(require 'helm-config)
@@ -75,16 +77,16 @@
:config (setq helm-candidate-number-limit 100
helm-idle-delay 0.0 ; update fast sources immediately (doesn't).
- helm-input-idle-delay 0.01 ; this actually updates things reeeelatively quickly.
- helm-yas-display-key-on-candidate t
- helm-quick-update t
- helm-M-x-requires-pattern nil
- helm-ff-skip-boring-files t
- helm-split-window-in-side-p t ; open helm buffer inside current window
- helm-M-x-fuzzy-match t
- helm-buffers-fuzzy-matching t
- helm-recentf-fuzzy-match t
- helm-ff-file-name-history-use-recentf t)
+ helm-input-idle-delay 0.01 ; this actually updates things reeeelatively quickly.
+ helm-yas-display-key-on-candidate t
+ helm-quick-update t
+ helm-M-x-requires-pattern nil
+ helm-ff-skip-boring-files t
+ helm-split-window-in-side-p t ; open helm buffer inside current window
+ helm-M-x-fuzzy-match t
+ helm-buffers-fuzzy-matching t
+ helm-recentf-fuzzy-match t
+ helm-ff-file-name-history-use-recentf t)
:bind (("C-c h" . helm-mini)
("C-h a" . helm-apropos)
@@ -92,17 +94,22 @@
("C-x C-f" . helm-find-files)
("M-y" . helm-show-kill-ring)
("M-x" . helm-M-x)
- ("<tab>" . helm-execute-persistent-action)
- ("C-i" . helm-execute-persistent-action) ; make TAB works in terminal
("C-x c o" . helm-occur)
("C-x c y" . helm-yas-complete)
("C-x c Y" . helm-yas-create-snippet-on-region)
- ("C-x c SPC" . helm-all-mark-rings))
+ ("C-x c SPC" . helm-all-mark-rings)
+ :map helm-map
+ ("<tab>" . helm-execute-persistent-action)
+ ("C-i" . helm-execute-persistent-action) ; make TAB works in terminal
+ ("C-z" . helm-select-action))
:diminish helm-mode)
+
+
(use-package markdown-mode
:mode ("\\.markdown\\'" "\\.md\\'")
:config (setq markdown-command "/usr/bin/pandoc"))
+
(use-package minimap
:config (progn
(setq minimap-width-fraction 0.1
@@ -120,6 +127,7 @@
'(neo-root-dir-face ((t :inherit link-visited :underline nil)) t))
(setq neo-theme 'ascii))
:bind (("<f8>" . neotree-toggle)))
+
(use-package projectile
:diminish projectile-mode
:config (progn
@@ -132,6 +140,7 @@
(helm-projectile-on)))
(use-package helm-projectile)
+
(use-package scala-mode2
:interpreter
("scala" . scala-mode)