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

diff --git a/emacs.d/init.el b/emacs.d/init.el
index 2869f69..bd7b601 100644
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -91,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
@@ -107,7 +100,7 @@
 ;(setq speedbar-show-unknown-files t)
 
 
-(toggle-frame-fullscreen)
+;(toggle-frame-fullscreen)
 
 
 (require 'projectile)
@@ -120,85 +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)
 
-;; gnu global support
-;(require 'semantic/db)
-;(global-semanticdb-minor-mode 1)
 
-(require 'init-ggtags)
+(require 'recentf-ext)
 
-(global-unset-key "\C-o")
-(global-set-key (kbd "C-o C-f") 'ido-find-file)
-(global-set-key (kbd "C-o C-b") 'ido-switch-buffer)
+(require 'init-key-binding)
 
-(global-set-key (kbd "C-o g") 'ggtags-find-file)
-(global-set-key (kbd "C-o t") 'ggtags-find-tag-dwim)
+(require 'linum-relative)
+(winner-mode 1)
 
-(global-set-key (kbd "M-g M-g") 'magit-status)
+(global-set-key (kbd "C-c C-l") 'winner-redo)
+(global-set-key (kbd "C-c C-h") 'winner-undo)
 
 
-(setq scroll-margin 5)
-(setq scroll-conservatively 10000)
-(show-paren-mode t)
 
-;;; next, cedet & ecb for c++ development
-(require 'cc-mode)
-(require 'semantic)
+;(require 'minibuffer-tray)
+;(require 'eyebrowse)
+;(eyebrowse-mode t)
 
-(global-semanticdb-minor-mode 1)
-(global-semantic-idle-scheduler-mode 1)
+;(require 'workgroups2)
+;(workgroups-mode 1)
 
-(semantic-mode 1)
 
+(require 'minibuffer-line)
+(minibuffer-line-mode 1)
 
-(add-hook 'c++-mode-hook 'irony-mode)
-(add-hook 'c-mode-hook 'irony-mode)
-(add-hook 'objc-mode-hook 'irony-mode)
+
+;(add-to-list 'load-path "~/.emacs.d/vendor")
+;(require 'minibuffer-tray)
+;(minibuffer-tray-mode 1)
 
 
-;;---------------------------------------------------------------------------------------
-;; irony-mode
-;;
-;; replace the `completion-at-point' and `complete-symbol' bindings in
-;; irony-mode's buffers by irony-mode's function
-(defun my-irony-mode-hook ()
-  (define-key irony-mode-map [remap completion-at-point]
-    'irony-completion-at-point-async)
-  (define-key irony-mode-map [remap complete-symbol]
-    'irony-completion-at-point-async))
-(add-hook 'irony-mode-hook 'my-irony-mode-hook)
-(add-hook 'irony-mode-hook 'irony-cdb-autosetup-compile-options)
-
-
-
-
-;; c/c++ auto-complete, yasnippet, auto-complet-c-headers
-;;https://www.youtube.com/watch?v=HTUE03LnaXA&list=PL-mFLc7R_MJet8ItKipCtYc7PWoS5KTfM
-(require 'auto-complete)
-(require 'auto-complete-config)
-(ac-config-default)
-;; input TAB to 
-(require 'yasnippet)
-(yas-global-mode 1)
-
-;; auto-complete-c-headers
-(defun my:ac-c-header-init ()
-  (require 'auto-complete-c-headers)
-  (add-to-list 'ac-sources 'ac-source-c-headers)
-  (add-to-list 'achead:include-directories "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/6.0/include")
-)
-;; call this function from c/c++ hooks
-(add-hook 'c++-mode-hook 'my:ac-c-header-init)
-(add-hook 'c-mode-hook 'my:ac-c-header-init)