Permalink
Browse files

emacs stuff

  • Loading branch information...
1 parent 764629d commit 13bcf4157f841503cfbf215593ad3c557a7fc092 @myfreeweb committed Jun 6, 2012
Showing with 41 additions and 9 deletions.
  1. +6 −0 .gitmodules
  2. +32 −8 emacs
  3. +1 −0 emacs.d/evil
  4. +1 −0 emacs.d/surround
  5. +1 −1 zshuery
View
@@ -214,3 +214,9 @@
[submodule "emacs.d/clojure"]
path = emacs.d/clojure
url = git://github.com/technomancy/clojure-mode.git
+[submodule "emacs.d/evil"]
+ path = emacs.d/evil
+ url = git://gitorious.org/evil/evil.git
+[submodule "emacs.d/surround"]
+ path = emacs.d/surround
+ url = git://github.com/timcharper/evil-surround.git
View
40 emacs
@@ -4,6 +4,8 @@
(setq emacs-dir "~/.emacs.d")
(add-to-list 'load-path emacs-dir)
+(defun addpath (dir)
+ (add-to-list 'load-path (concat emacs-dir "/" dir)))
;;; Encoding, input
(set-terminal-coding-system 'utf-8)
@@ -53,7 +55,7 @@
kill-buffer-query-functions)
redisplay-dont-pause t)
(setq-default indent-tabs-mode nil
- tab-width 4)
+ tab-width 2)
;;; Aliases
(defalias 'eb 'eval-buffer)
@@ -68,25 +70,47 @@
(global-set-key (kbd "C-k") 'kill-whole-line)
;;; Plugins
-(add-to-list 'load-path (concat emacs-dir "/vimvars"))
+(addpath "evil")
+(addpath "evil/lib")
+(require 'cl)
+(require 'evil)
+(evil-mode t)
+(define-key evil-normal-state-map (kbd "k") 'evil-next-line)
+(define-key evil-normal-state-map (kbd "j") 'evil-previous-line)
+(define-key evil-normal-state-map [escape] 'keyboard-quit)
+(define-key evil-visual-state-map [escape] 'keyboard-quit)
+(define-key minibuffer-local-map [escape] 'minibuffer-keyboard-quit)
+(define-key minibuffer-local-ns-map [escape] 'minibuffer-keyboard-quit)
+(define-key minibuffer-local-completion-map [escape] 'minibuffer-keyboard-quit)
+(define-key minibuffer-local-must-match-map [escape] 'minibuffer-keyboard-quit)
+(define-key minibuffer-local-isearch-map [escape] 'minibuffer-keyboard-quit)
+
+(addpath "surround")
+(require 'surround)
+(global-surround-mode t)
+
+(addpath "vimvars")
(require 'vimvars)
(add-hook 'find-file-hook 'vimvars-obey-vim-modeline)
-(add-to-list 'load-path (concat emacs-dir "/smart-tab"))
+(addpath "smart-tab")
(require 'smart-tab)
(global-smart-tab-mode t)
-(add-to-list 'load-path (concat emacs-dir "/popwin"))
+(addpath "popwin")
(require 'popwin)
(setq display-buffer-function 'popwin:display-buffer)
-(add-to-list 'load-path (concat emacs-dir "/autopair"))
+(addpath "autopair")
(require 'autopair)
(autopair-global-mode)
-(add-to-list 'load-path (concat emacs-dir "/color-theme"))
-(add-to-list 'load-path (concat emacs-dir "/color-theme-solarized"))
+(addpath "color-theme")
+(addpath "color-theme-solarized")
(require 'color-theme)
(require 'color-theme-solarized)
(color-theme-initialize)
-(color-theme-solarized-light)
+(color-theme-solarized-light)
+
+(addpath "clojure")
+(require 'clojure-mode)
Submodule evil added at d62469
Submodule surround added at 0a6741
Submodule zshuery updated 1 files
+1 −1 completion

0 comments on commit 13bcf41

Please sign in to comment.