emacs: elscreen fix magit default-directory changed issue.

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

diff --git a/emacs.d/init.el b/emacs.d/init.el
index 306cb01..dec8eb3 100644 (file)
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -34,6 +34,7 @@
 
 ;; elscreen should be placed begin of https://github.com/knu/elscreen/issues/6
 (elscreen-start)
+(require 'init-elscreen)
 (require 'init-color-theme)
 ;(require 'init-my-theme-2)
 
@@ -96,8 +97,9 @@
                            (eshell-mode . emacs))
     do (evil-set-initial-state mode state))
 
-;(evil-mode 1)
 
+;(global-evil-tabs-mode t)
+;(evil-mode 1)
 ;;---------------------------------------------------------------------------------------
 ;; Fiplr
 ;;
@@ -115,7 +117,39 @@
 (global-set-key (kbd "C-x C-k") 'windmove-up)
 (global-set-key (kbd "C-x C-j") 'windmove-down)
 
-
+;;---------------------------------------------------------------------------------------
+;; sr-speedbar
+;;
+;(require 'sr-speedbar)
+;(setq speedbar-use-images nil)
+;(setq speedbar-show-unknown-files t)
 
 
 (toggle-frame-fullscreen)
+
+
+(require 'projectile)
+(projectile-global-mode)
+(setq projectile-enable-caching t)
+(require 'projectile-speedbar)
+
+(require 'cc-mode)
+(require 'ecb)
+
+(setq ecb-layout-name "leftright3")
+
+
+;(setq mac-command-modifier 'super) ; make cmd key do Meta
+(global-set-key (kbd "<s-return>") 'toggle-frame-fullscreen)
+
+
+
+
+(global-set-key (kbd "M-g M-v") 'split-window-right)
+(global-set-key (kbd "M-g M-s") 'split-window-below)
+(global-set-key (kbd "M-g M-o") 'delete-other-windows)
+
+(global-set-key (kbd "M-g M-w") 'other-window)
+
+;;;; show default directory on mode-line
+