X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Finit.el;h=c08899a1761a70096c05ec7b415ffd124bfd8550;hb=571a856d46cc208bb82626de279aa2eddc5cc2ef;hp=7934dbe9f7f7df1ea06d0598fa99b026bc8ed09d;hpb=181e3f6d88828baf418919f1dae05a2eb9cdfc69;p=dotfiles.git

diff --git a/emacs.d/init.el b/emacs.d/init.el
index 7934dbe..c08899a 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
 ;;
@@ -125,7 +107,7 @@
 ;(setq speedbar-show-unknown-files t)
 
 
-(toggle-frame-fullscreen)
+;(toggle-frame-fullscreen)
 
 
 (require 'projectile)
@@ -133,9 +115,44 @@
 (setq projectile-enable-caching t)
 (require 'projectile-speedbar)
 
-(require 'cc-mode)
-(require 'ecb)
+;(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)
+
+;; gnu global support
+;(require 'semantic/db)
+;(global-semanticdb-minor-mode 1)
+
+(require 'init-ggtags)
+
+(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)
+
+(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)
+
+
+(setq scroll-margin 5)
+(setq scroll-conservatively 10000)
+(show-paren-mode t)
 
-(setq ecb-layout-name "leftright3")
 
+(require 'init-c-cpp)