Merge branch 'master' of github.com:seudut/dotfiles

[dotfiles.git] / emacs.d / init.el

diff --git a/emacs.d/init.el b/emacs.d/init.el
index c0e1fec..0e486ec 100644 (file)
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -20,24 +20,20 @@
 (require 'init-project)
 (require 'init-ggtags)
 
-(setq scroll-margin 5)
-(setq scroll-conservatively 10000)
-(show-paren-mode t)
-
 
 ;;;; conflict with C-c . in org-mode, disable it temporarily
 ;;;;(require 'init-c-cpp)
 (require 'init-key-binding)
 (require 'init-winner)
 (require 'init-minibuffer)
-
+(require 'init-eshell)
 
 ;; http://stackoverflow.com/questions/11484225/fix-an-auto-complete-mode-and-linum-mode-annoyance
 ;;;(ac-linum-workaround)
 
 
 (require 'init-mode-line)
-(require 'init-workgroup2)
+;(require 'init-workgroup2)
 (require 'init-perl)
 
 ;(add-to-list 'load-path "~/.emacs.d/Emacs-PDE-0.2.16/lisp/")
@@ -113,7 +109,7 @@
 
 
 ;(require 'init-org)
-;(setq help-window-select t)
+(setq help-window-select t)
 
 
 ;;  (add-to-list 'load-path "~/.emacs.d/site-lisp/eim")
@@ -129,8 +125,22 @@
 ;(require 'init-keychord)
 
 ;(setq hydra-examples-verbatim t)
-;(require 'init-hydra)
+(require 'init-hydra)
 
 
 ;(require 'ace-window)
 ;(global-set-key (kbd "M-p") 'ace-window)
+
+
+(require 'init-multi-term)
+(require 'init-projectile)
+
+(require 'page-break-lines)
+;(turn-on-page-break-lines-mode)
+(global-page-break-lines-mode 1)
+
+;(setq projectile-completion-system 'helm)
+;(helm-projectile-on)
+
+
+;; show projectile name in mode-line