X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Finit.el;h=813f41a2555716f258a53f4a48580415940913b0;hb=ce562e8d702a6af572e9955c7c0ee713516b6b37;hp=b2e5aad3212d334d9c71713af1b2e7ad8852fa48;hpb=4a7b856764eb75389764886dd5ef33655f9ef05e;p=dotfiles.git

diff --git a/emacs.d/init.el b/emacs.d/init.el
index b2e5aad..813f41a 100644
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -1,120 +1,8 @@
-(setq debug-on-error t)
 
-(scroll-bar-mode -1)
-(tool-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" ))
+;; Added by Package.el.  This must come before configurations of
+;; installed packages.  Don't delete this line.  If you don't want it,
+;; just comment it out by adding a semicolon to the start of the line.
+;; You may delete these explanatory comments.
+;(package-initialize)
 
-
-(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)
-
-
-(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 ?┃))
-
-(set-face-attribute 'vertical-border nil  :foreground "gray")
-
-
-(add-to-list 'load-path "~/.emacs.d/config")
-(require 'my-packages)
-
-(require 'init-color-theme)
-;(require 'my-powerline)
-;(require 'init-my-theme-2)
-
-
-;---------------------------------------------------------------------------------------
-;; Ido
-;;
-(require 'ido-vertical-mode)
-(ido-vertical-mode 1)
-(require 'flx-ido)
-(ido-mode 1)
-(ido-everywhere 1)
-(flx-ido-mode 1)
-(setq ido-use-faces nil)
-
-(setq org-completion-use-ido t)
-(setq magit-completing-read-function 'magit-ido-completing-read)
-
-(require 'ido-ubiquitous)
-(ido-ubiquitous-mode 1)
-
-;; smex
-(require 'smex) 
-(global-set-key (kbd "M-x") 'smex)
-(global-set-key (kbd "M-X") 'smex-major-mode-commands)
-
-;;---------------------------------------------------------------------------------------
-;; Magit
-;;
-(require 'magit)
-(setq magit-last-seen-setup-instructions "1.4.0")
-;(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)
-;			    (wdired-mode . normal)
-			    (eshell-mode . emacs))
-    do (evil-set-initial-state mode state))
-
-;(evil-mode 1)
-
-;;---------------------------------------------------------------------------------------
-;; Fiplr
-;;
-(setq fiplr-root-markers '(".git" ".svn" "*.DS_Store"))
-(setq fiplr-ignored-globs '((directories (".git" ".svn"))
-                            (files ("*.jpg" "*.png" "*.zip" "*~" "*.o" ".obj" "*.swp" "*.hg" ".pyc" ".*" ))))
-
-(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)
-
-
-
-
-(toggle-frame-fullscreen)
+(org-babel-load-file "~/.emacs.d/config.org")