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

diff --git a/emacs.d/init.el b/emacs.d/init.el
index eea7c4b..bd7b601 100644
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -1,3 +1,12 @@
+;;;(if (eq system-type 'darwin)
+;;;  (setenv "PATH"
+;;;)   (concat (getenv "path") ":/usr/local/bin:~/bin/")
+;;;  )
+
+
+(setenv "PATH" (concat (getenv "PATH") ":/usr/local/bin"))
+(setq exec-path (append exec-path '("/usr/local/bin")))
+
 (setq debug-on-error t)
 
 (scroll-bar-mode -1)
@@ -36,7 +45,7 @@
 (elscreen-start)
 (require 'init-elscreen)
 (require 'init-color-theme)
-;(require 'init-my-theme-2)
+
 
 ;---------------------------------------------------------------------------------------
 ;; Ido
@@ -65,41 +74,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
 ;;
@@ -109,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
@@ -125,7 +100,7 @@
 ;(setq speedbar-show-unknown-files t)
 
 
-(toggle-frame-fullscreen)
+;(toggle-frame-fullscreen)
 
 
 (require 'projectile)
@@ -133,26 +108,56 @@
 (setq projectile-enable-caching t)
 (require 'projectile-speedbar)
 
-(require 'cc-mode)
-(require 'ecb)
+;(require 'cc-mode)
+;(require 'ecb)
+
+;(setq ecb-layout-name "leftright3")
+
+;; gnu global support
+;(require 'semantic/db)
+;(global-semanticdb-minor-mode 1)
+
+(require 'init-ggtags)
+
+
+(setq scroll-margin 5)
+(setq scroll-conservatively 10000)
+(show-paren-mode t)
+
+
+(require 'init-c-cpp)
+
+(require 'recentf)
+(recentf-mode 1)
+(setq recentf-max-menu-items 100)
+
+
+(require 'recentf-ext)
+
+(require 'init-key-binding)
+
+(require 'linum-relative)
+(winner-mode 1)
 
-(setq ecb-layout-name "leftright3")
+(global-set-key (kbd "C-c C-l") 'winner-redo)
+(global-set-key (kbd "C-c C-h") 'winner-undo)
 
 
-;(setq mac-command-modifier 'super) ; make cmd key do Meta
-(global-set-key (kbd "<s-return>") 'toggle-frame-fullscreen)
 
+;(require 'minibuffer-tray)
+;(require 'eyebrowse)
+;(eyebrowse-mode t)
 
+;(require 'workgroups2)
+;(workgroups-mode 1)
 
 
-(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 'minibuffer-line)
+(minibuffer-line-mode 1)
 
-(global-set-key (kbd "M-g M-w") 'other-window)
 
-;(global-set-key (kbd "C-g C-k") 'windmove-up)
-;(global-set-key (kbd "C-g C-j") 'windmove-down)
+;(add-to-list 'load-path "~/.emacs.d/vendor")
+;(require 'minibuffer-tray)
+;(minibuffer-tray-mode 1)
 
-;;;; show default directory on mode-line