X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Finit.el;h=bd7b601ca810e42bc8363637f1dfe1d5a1fb7915;hb=35a0f0ec8411a1f89dc67b9d87afc01692ef366a;hp=922fa94e3e0ec5823ba082478c53919664570379;hpb=94210cd24e8e54d26a95d405cd36a970ccbf9a6f;p=dotfiles.git

diff --git a/emacs.d/init.el b/emacs.d/init.el
index 922fa94..bd7b601 100644
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -74,10 +74,11 @@
 ;;
 (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)
+;(require 'init-evil)
 
 
 
@@ -90,13 +91,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
@@ -106,7 +100,7 @@
 ;(setq speedbar-show-unknown-files t)
 
 
-(toggle-frame-fullscreen)
+;(toggle-frame-fullscreen)
 
 
 (require 'projectile)
@@ -119,35 +113,51 @@
 
 ;(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)
 
-;; gnu global support
-;(require 'semantic/db)
-;(global-semanticdb-minor-mode 1)
+(require 'linum-relative)
+(winner-mode 1)
+
+(global-set-key (kbd "C-c C-l") 'winner-redo)
+(global-set-key (kbd "C-c C-h") 'winner-undo)
+
+
+
+;(require 'minibuffer-tray)
+;(require 'eyebrowse)
+;(eyebrowse-mode t)
+
+;(require 'workgroups2)
+;(workgroups-mode 1)
 
-(require 'init-ggtags)
 
+(require 'minibuffer-line)
+(minibuffer-line-mode 1)
 
 
-(global-unset-key "\C-o")
-(global-set-key (kbd "C-o f") 'ido-find-file)
-(global-set-key (kbd "C-o j") 'ido-switch-buffer)
+;(add-to-list 'load-path "~/.emacs.d/vendor")
+;(require 'minibuffer-tray)
+;(minibuffer-tray-mode 1)
 
-(global-set-key (kbd "C-o g") 'ggtags-find-file)
-(global-set-key (kbd "C-o t") 'ggtags-find-tag-dwim)
 
-(global-set-key (kbd "M-g M-g") 'magit-status)