X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;ds=sidebyside;f=emacs.d%2Finit.el;h=306cb0189ff9f7c21e2ad88a69a103a90a8daa05;hb=26edc119810245e82dbfa623f5888cfdb3eb3b02;hp=7976c0cc407c931010d449c00cbde302ee73ea62;hpb=09a27f206951958452a9232ca26a169823c4af1d;p=dotfiles.git

diff --git a/emacs.d/init.el b/emacs.d/init.el
index 7976c0c..306cb01 100644
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -2,12 +2,11 @@
 
 (scroll-bar-mode -1)
 (tool-bar-mode -1)
-(menu-bar-mode -1)
+;(menu-bar-mode -1)
 (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)
 
 
 (put 'set-goal-column 'disabled nil)
@@ -16,77 +15,29 @@
 (setq ring-bell-function 'ignore)
 (setq resize-mini-windows t)
 
-(setq ns-use-srgb-colorspace nil)
+
 (add-to-list 'auto-mode-alist '("emacs\\'" . emacs-lisp-mode))
-;(set-fringe-mode nil)
 (fringe-mode 0)
-;(set-fringe-mode 1)
 
-;(set-face-inverse-video-p 'vertical-border nil)
-;(set-face-background 'vertical-border (face-background 'default))
-;
-;;; Set symbol for the border
-;(set-display-table-slot standard-display-table
-;                        'vertical-border 
-;                        (make-glyph-code ?┃))
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;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.")
+;;; Set symbol for the border
+(set-display-table-slot standard-display-table
+                        'vertical-border 
+                        (make-glyph-code ?┃))
 
-(require 'cl)
-(defun packages-installed-p ()
-  (loop for p in required-packages
-        when (not (package-installed-p p)) do (return nil)
-        finally (return t)))
+(set-face-attribute 'vertical-border nil  :foreground "gray")
 
-(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))))
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-					;
-;;(elscreen-start)
 
-;;---------------------------------------------------------------------------------------
-;; 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-color-theme)
+;(require 'init-my-theme-2)
+
+;---------------------------------------------------------------------------------------
 ;; Ido
 ;;
 (require 'ido-vertical-mode)
@@ -96,16 +47,6 @@
 (ido-everywhere 1)
 (flx-ido-mode 1)
 (setq ido-use-faces nil)
-;(setq ido-enable-flex-matching t)
-;(setq ido-use-faces t)
-;(setq ido-use-faces nil)
-;(set-face-attribute 'ido-vertical-first-match-face nil
-;		    :background "#e5b7c0")
-;(set-face-attribute 'ido-vertical-only-match-face nil
-;		    :background "#e52b50"
-;		    :foreground "white")
-;(set-face-attribute 'ido-vertical-match-face nil
-;		    :foreground "#b00000")
 
 (setq org-completion-use-ido t)
 (setq magit-completing-read-function 'magit-ido-completing-read)
@@ -122,16 +63,11 @@
 ;; Magit
 ;;
 (require 'magit)
-;(setq magit-auto-revert-mode nil)
 (setq magit-last-seen-setup-instructions "1.4.0")
+;(setq magit-auto-revert-mode nil)
+
+
 
-;;---------------------------------------------------------------------------------------
-;; powerline
-;;
-;(require 'powerline)
-;(powerline-evil-vim-color-theme)
-;(powerline-evil-center-color-theme)
-(display-time-mode t)
 
 ;;---------------------------------------------------------------------------------------
 ;; evil
@@ -143,24 +79,9 @@
 (evil-leader/set-key "w" 'evil-write)
 (require 'evil)
 ;(setq key-chord-two-keys-delay 0.5)
-;(key-chord-define evil-normal-state-map "jj" 'evil-force-normal-state)
-;(key-chord-define evil-visual-state-map "jj" 'evil-change-to-previous-state)
 (key-chord-define evil-insert-state-map "jj" 'evil-normal-state)
-;(key-chord-define evil-replace-state-map "jj" 'evil-normal-state)
 (key-chord-mode 1)
 
-;; change mode-line color by evil state
-;(lexical-let ((default-color (cons (face-background 'mode-line)
-;				   (face-foreground 'mode-line))))
-;  (add-hook 'post-command-hook
-;	    (lambda ()
-;	      (let ((color (cond ((minibufferp) default-color)
-;				 ((evil-insert-state-p) '("#e80000" . "#ffffff"))
-;				 ((evil-emacs-state-p)  '("#444488" . "#ffffff"))
-;				 ((buffer-modified-p)   '("#006fa0" . "#ffffff"))
-;				 (t default-color))))
-;		(set-face-background 'mode-line (car color))
-;		           (set-face-foreground 'mode-line (cdr color))))))
 ;; cursor shape
 (setq evil-emacs-state-cursor '("red" box))
 (setq evil-normal-state-cursor '("green" box))
@@ -171,27 +92,11 @@
 ;;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 'powerline-evil)
-;; TODO: enter emacs mode in eshll rather then evil mode
+;(evil-mode 1)
 
 ;;---------------------------------------------------------------------------------------
 ;; Fiplr
@@ -201,65 +106,16 @@
                             (files ("*.jpg" "*.png" "*.zip" "*~" "*.o" ".obj" "*.swp" "*.hg" ".pyc" ".*" ))))
 
 (global-set-key (kbd "C-x f") 'fiplr-find-file)
-;;---------------------------------------------------------------------------------------
-
-;(setq mac-right-option-modifier 'control)
-
-
 
 ;;---------------------------------------------------------------------------------------
-;; Helm
-;;
-;;;;;;;;;;; helm configuration https://github.com/emacs-helm/helm http://tuhdo.github.io/helm-intro.html
-;;(require 'helm-config)
-;;(global-set-key (kbd "M-x") 'helm-M-x)
-;;(helm-mode 1)
-;;(setq helm-M-x-fuzzy-match t)
-;;(global-set-key (kbd "C-x b") 'helm-mini)
-;;(setq helm-buffers-fuzzy-matching t
-;;      helm-recentf-fuzzy-match    t)
-;;(global-set-key (kbd "C-x C-f") 'helm-find-files)
-;;(when (executable-find "ack-grep")
-;;  (setq helm-grep-default-command "ack-grep -Hn --no-group --no-color %e %p %f"
-;;        helm-grep-default-recurse-command "ack-grep -H --no-group --no-color %e %p %f"))
-;;(setq helm-ff-skip-boring-files t)
-;;;(require 'helm-config)
-;;;(require 'helm-themes)
-;;;(set-face-attribute 'helm-selection nil :background "#441100")
-
-;;---------------------------------------------------------------------------------------
-;; auto-complete
-;;
-(require 'auto-complete)
-(auto-complete-mode 1)
-
-
-;;; ---------------------------------------- el-get -----------------------------------------
-;(require 'el-get)
-;(add-to-list 'el-get-recipe-path "~/.emacs.d/el-get-user/recipes")
-
-;(el-get-bundle packages/sm-package-powerline
-;  :url "https://github.com/laynor/emacs-conf.git"
-;  )
-
-
-
 ;; 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)
 
-;(global-set-key (kbd "C-x C-s") 'split-window-right)
-
-;; windows devider
-(set-face-attribute 'vertical-border 
-                    nil 
-                    :foreground "gray")
 
 
 
-
-
-(add-to-list 'load-path "~/.emacs.d/config")
-(require 'init-color-theme)
+(toggle-frame-fullscreen)