Permalink
Browse files

pelm-evil almost done

  • Loading branch information...
1 parent 4519a63 commit 500bc931bf8fbd0560867da111fa089b2fae193e @eggcaker committed Sep 21, 2012
Showing with 25 additions and 30 deletions.
  1. +10 −6 init.el
  2. +9 −23 plugins/pelm-evil.el
  3. +6 −1 plugins/pelm-org.el
View
@@ -2,6 +2,10 @@
;; Author: caker
;; Last modified: 2012-09-20
;; Version: 1.7.0
+;;
+;; TODO: move the keymap setup to runtime instead keys
+;;
+
;; pelm start time
(defvar *pelm-load-start* (current-time))
@@ -35,27 +39,27 @@
'(
runtime
package
- editor
keys
ui
- shell
- server
+ editor
git
yas
org
evil
c
markups
- scala
+ ;scala
java
php
js
lisp
- objc
- misc
+ ;objc
blog
mail
android
+ shell
+ misc
+ server
))
;; load plugins
View
@@ -11,17 +11,15 @@
;;; Code:
-(setq el-get-evil
- '((:name evil
- :after (progn
- ))
+(setq el-get-evil-packages
+ '((:name evil)
(:name evil-numbers)
(:name evil-leader)
(:name evil-surround)
))
-(el-get 'sync (loop for src in el-get-evil collect (el-get-source-name src)))
+(el-get 'sync (loop for src in el-get-evil-packages collect (el-get-source-name src)))
(evil-mode 1)
(global-surround-mode 1)
@@ -49,25 +47,14 @@
(define-key evil-normal-state-map (kbd "C-.") nil)
-
-
-(define-key evil-normal-state-map ",w" 'save-buffer) ; save
-(define-key evil-normal-state-map ",q" 'kill-buffer) ; quit (current buffer; have to press RETURN)
-
-(define-key evil-normal-state-map ",x" 'save-buffers-kill-emacs) ; save and quit
+(define-key evil-normal-state-map ",a" 'org-agenda)
(define-key evil-normal-state-map ";e" 'eval-last-sexp)
-
-(define-minor-mode pelm-evil-org-mode
- :init-value nil
- :lighter "PEO"
- :keymap (make-sparse-keymap)
- :group 'pelm
- )
-
-(add-hook 'org-mode-hook 'pelm-evil-org-mode)
+(define-key evil-normal-state-map ",q" 'kill-buffer)
+(define-key evil-normal-state-map ",w" 'save-buffer)
+(define-key evil-normal-state-map ",x" 'save-buffers-kill-emacs)
-(evil-define-key 'normal pelm-evil-org-mode-map
+(evil-define-key 'normal org-mode-map
"gh" 'outline-up-heading
"gj" 'org-forward-same-level
"gk" 'org-backward-same-level
@@ -78,11 +65,10 @@
"L" 'org-shiftright
"t" 'org-todo
"$" 'org-end-of-line
- "^" 'org-beginning-of-line
+ "0" 'org-beginning-of-line
"-" 'org-ctrl-c-minus
"<" 'org-metaleft
">" 'org-metaright
- ";a" 'org-agenda ; access agenda buffer
)
;; normal & insert state shortcuts.
View
@@ -9,12 +9,17 @@
;;; Code:
+(setq el-get-org-packages
+ '((:name org-mode)
+ ))
+
+(el-get 'sync (loop for src in el-get-org-packages collect (el-get-source-name src)))
+
;;require contrib lisps
(require 'org-checklist)
(require 'org-contacts)
(require 'org-crypt)
-
(add-hook 'org-mode-hook
'(lambda ()
(yas/minor-mode-on)

0 comments on commit 500bc93

Please sign in to comment.