X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;ds=sidebyside;f=emacs.d%2Finit.el;h=642bbb7d50dfa1af5a62d7228cd3499143d36202;hb=6150cd9d9e10c10dfef605ab236f54fed633d600;hp=5960b6bfde580cfa50d8b95a1797f084af0a3708;hpb=8f8b7508826ea8c90dff977488c31604fdcfdf3a;p=dotfiles.git

diff --git a/emacs.d/init.el b/emacs.d/init.el
index 5960b6b..642bbb7 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)
@@ -6,82 +15,40 @@
 (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" ))
-(load-theme 'tango-dark)
-
-(display-time-mode t)
+(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)
+
 
-(setq ns-use-srgb-colorspace nil)
 (add-to-list 'auto-mode-alist '("emacs\\'" . emacs-lisp-mode))
 (fringe-mode 0)
 
-;
+
+
 ;;; Set symbol for the border
 (set-display-table-slot standard-display-table
                         'vertical-border 
                         (make-glyph-code ?┃))
 
-;;---------------------------------------------------------------------------------------
-;; package
-;; http://y.tsutsumi.io/emacs-from-scratch-part-2-package-management.html
-(require 'package)
-(add-to-list 'package-archives
-             '("melpa" . "http://melpa.milkbox.net/packages/") t)
-(package-initialize)
-
-(defvar required-packages
-  '(
-    magit
-    helm
-    ido-ubiquitous
-    yasnippet
-    evil
-    ido-vertical-mode
-    smex
-    color-theme
-    color-theme-sanityinc-tomorrow
-    key-chord
-    powerline-evil
-    powerline
-    evil-leader
-    flx-ido
-    flx
-    auto-complete
-    fiplr
-    w3m
-    ace-jump-mode
-    el-get
-    color-identifiers-mode
-    elscreen
-  ) "a list of packages to ensure are installed at launch.")
-
-(require 'cl)
-(defun packages-installed-p ()
-  (loop for p in required-packages
-        when (not (package-installed-p p)) do (return nil)
-        finally (return t)))
-
-(unless (packages-installed-p)
-  (message "%s" "Emacs is now refreshing its package database...")
-  (package-refresh-contents)
-  (message "%s" " done.")
-  (dolist (p required-packages)
-    (when (not (package-installed-p p))
-      (package-install p))))
+(set-face-attribute 'vertical-border nil  :foreground "gray")
 
-;;---------------------------------------------------------------------------------------
-;; color theme
-;;
-(require 'color-theme)
-(load-theme 'sanityinc-tomorrow-bright t)
 
-;;---------------------------------------------------------------------------------------
+(add-to-list 'load-path "~/.emacs.d/config")
+(require 'my-packages)
+
+;; elscreen should be placed begin of https://github.com/knu/elscreen/issues/6
+;(elscreen-start)
+;(require 'init-elscreen)
+(require 'init-color-theme)
+
+
+;---------------------------------------------------------------------------------------
 ;; Ido
 ;;
 (require 'ido-vertical-mode)
@@ -108,51 +75,13 @@
 ;;
 (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)
 
 
-;;---------------------------------------------------------------------------------------
-;; 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)
-;			    (nrepl-mode . insert)
-;			    (pylookup-mode . emacs)
-;			    (comint-mode . normal)
-;			    (shell-mode . emacs)
-;			    (git-commit-mode . insert)
-;			    (git-rebase-mode . emacs)
-;			    (term-mode . emacs)
-;			    (help-mode . emacs)
-;			    (helm-grep-mode . emacs)
-;			    (grep-mode . emacs)
-;			    (bc-menu-mode . emacs)
-;			    (magit-branch-manager-mode . emacs)
-;			    (rdictcc-buffer-mode . emacs)
-;			    (dired-mode . emacs)
-;			    (wdired-mode . normal)
-			    (eshell-mode . emacs))
-    do (evil-set-initial-state mode state))
-
-(evil-mode 1)
+(require 'init-evil)
+
+
 
 ;;---------------------------------------------------------------------------------------
 ;; Fiplr
@@ -163,19 +92,81 @@
 
 (global-set-key (kbd "C-x f") 'fiplr-find-file)
 
+
 ;;---------------------------------------------------------------------------------------
-;; Wind-move
+;; sr-speedbar
 ;;
-(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)
+;(require 'sr-speedbar)
+;(setq speedbar-use-images nil)
+;(setq speedbar-show-unknown-files t)
 
 
-;;---------------------------------------------------------------------------------------
-;; Wind-move
-;;
-(set-face-attribute 'vertical-border nil  :foreground "gray")
 
-(add-to-list 'load-path "~/.emacs.d/config")
-(require 'init-color-theme)
+
+(require 'projectile)
+(projectile-global-mode)
+(setq projectile-enable-caching t)
+(require 'projectile-speedbar)
+
+;(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)
+
+(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 '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 ")))))
+