X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Finit.el;h=642bbb7d50dfa1af5a62d7228cd3499143d36202;hb=6150cd9d9e10c10dfef605ab236f54fed633d600;hp=3a68001e0969dd475acc0c4245aad8e709f027e6;hpb=4d815fa7db47d5d78bc617445042402052cd32e5;p=dotfiles.git

diff --git a/emacs.d/init.el b/emacs.d/init.el
index 3a68001..642bbb7 100644
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -15,14 +15,15 @@
 (add-to-list 'default-frame-alist '(width  . 120))
 (add-to-list 'default-frame-alist '(height . 40))
 ;(add-to-list 'default-frame-alist '(font . "Source Code Pro for Powerline-12:weight:light" ))
-(add-to-list 'default-frame-alist '(font . "Source Code Pro for Powerline-12" ))
-
+(add-to-list 'default-frame-alist '(font . "Source Code Pro for Powerline-14" ))
+(setq inhibit-startup-message t)
 
 (put 'set-goal-column 'disabled nil)
 (setq vc-follow-symlinks t)
 (setq visible-bell 1)
 (setq ring-bell-function 'ignore)
 (setq resize-mini-windows t)
+(blink-cursor-mode 0)
 
 
 (add-to-list 'auto-mode-alist '("emacs\\'" . emacs-lisp-mode))
@@ -42,8 +43,8 @@
 (require 'my-packages)
 
 ;; elscreen should be placed begin of https://github.com/knu/elscreen/issues/6
-(elscreen-start)
-(require 'init-elscreen)
+;(elscreen-start)
+;(require 'init-elscreen)
 (require 'init-color-theme)
 
 
@@ -74,41 +75,14 @@
 ;;
 (require 'magit)
 (setq magit-last-seen-setup-instructions "1.4.0")
+(global-set-key (kbd "C-x g") 'magit-status)
 ;(setq magit-auto-revert-mode nil)
 
 
+(require 'init-evil)
+
 
 
-;;---------------------------------------------------------------------------------------
-;; evil
-;;
-(global-evil-leader-mode)
-(evil-leader/set-leader ";")
-(evil-leader/set-key "e" 'find-file)
-(evil-leader/set-key "b" 'switch-to-buffer)
-(evil-leader/set-key "w" 'evil-write)
-(require 'evil)
-;(setq key-chord-two-keys-delay 0.5)
-(key-chord-define evil-insert-state-map "jj" 'evil-normal-state)
-(key-chord-mode 1)
-
-;; cursor shape
-(setq evil-emacs-state-cursor '("red" box))
-(setq evil-normal-state-cursor '("green" box))
-(setq evil-visual-state-cursor '("orange" box))
-(setq evil-insert-state-cursor '("red" bar))
-(setq evil-replace-state-cursor '("red" bar))
-(setq evil-operator-state-cursor '("red" hollow))
-;;Enter an emacs mode in a given state http://wikemacs.org/wiki/Evil
-(loop for (mode . state) in '(
-;			    (inferior-emacs-lisp-mode . emacs)
-;			    (wdired-mode . normal)
-			    (eshell-mode . emacs))
-    do (evil-set-initial-state mode state))
-
-
-;(global-evil-tabs-mode t)
-;(evil-mode 1)
 ;;---------------------------------------------------------------------------------------
 ;; Fiplr
 ;;
@@ -118,13 +92,6 @@
 
 (global-set-key (kbd "C-x f") 'fiplr-find-file)
 
-;;---------------------------------------------------------------------------------------
-;; Wind-move
-;;
-(global-set-key (kbd "C-x C-l") 'windmove-right)
-(global-set-key (kbd "C-x C-h") 'windmove-left)
-(global-set-key (kbd "C-x C-k") 'windmove-up)
-(global-set-key (kbd "C-x C-j") 'windmove-down)
 
 ;;---------------------------------------------------------------------------------------
 ;; sr-speedbar
@@ -134,12 +101,11 @@
 ;(setq speedbar-show-unknown-files t)
 
 
-(toggle-frame-fullscreen)
 
 
 (require 'projectile)
 (projectile-global-mode)
-(setq projectile-enable-caching nil)
+(setq projectile-enable-caching t)
 (require 'projectile-speedbar)
 
 ;(require 'cc-mode)
@@ -147,26 +113,60 @@
 
 ;(setq ecb-layout-name "leftright3")
 
+;; gnu global support
+;(require 'semantic/db)
+;(global-semanticdb-minor-mode 1)
 
-;(setq mac-command-modifier 'super) ; make cmd key do Meta
-(global-set-key (kbd "<s-return>") 'toggle-frame-fullscreen)
+(require 'init-ggtags)
 
 
+(setq scroll-margin 5)
+(setq scroll-conservatively 10000)
+(show-paren-mode t)
 
 
-(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)
+(require 'init-c-cpp)
 
-(global-set-key (kbd "M-g M-w") 'other-window)
+(require 'recentf)
+(recentf-mode 1)
+(setq recentf-max-menu-items 100)
 
 
+(require 'recentf-ext)
 
+(require 'init-key-binding)
 
+(require 'linum-relative)
+(winner-mode 1)
 
-;; gnu global support
-;(require 'semantic/db)
-;(global-semanticdb-minor-mode 1)
+(global-set-key (kbd "C-c C-l") 'winner-redo)
+(global-set-key (kbd "C-c C-h") 'winner-undo)
 
-(require 'init-ggtags)
+
+
+;(require 'minibuffer-tray)
+;(require 'eyebrowse)
+;(eyebrowse-mode t)
+
+(require 'workgroups2)
+;;;;(workgroups-mode 1)
+
+
+;;(require 'minibuffer-line)
+;(minibuffer-line-mode 1)
+
+
+;(add-to-list 'load-path "~/.emacs.d/vendor")
+;(require 'minibuffer-tray)
+;(minibuffer-tray-mode 1)
+;(require 'xwem-minibuffer)
+
+; (run-at-time
+;  nil 30
+;  (lambda ()
+;    (with-current-buffer " *Minibuf-0*"
+;      (erase-buffer)
+;      (dotimes (spaces (- (frame-width) 20))
+;        (insert " "))
+;      (insert (format-time-string "%m-%d  %I:%M %p %a ")))))