emacs - tidy up init.el file

diff --git a/emacs.d/config/init-base.el b/emacs.d/config/init-base.el
new file mode 100644 (file)
index 0000000..5a4d64a
--- /dev/null
+++ b/emacs.d/config/init-base.el
@@ -0,0 +1,35 @@
+
+
+(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" ))
+(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)
+
+
+(add-to-list 'auto-mode-alist '("emacs\\'" . emacs-lisp-mode))
+
+
+
+;;; 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")
+
+
+
+
+
+(provide 'init-base)

diff --git a/emacs.d/config/init-elscreen.el b/emacs.d/config/init-elscreen.el
index 6aba31c..3edbacf 100644 (file)
--- a/emacs.d/config/init-elscreen.el
+++ b/emacs.d/config/init-elscreen.el
@@ -60,4 +60,19 @@
                   (cd el-dir))))))
 
 
+
+
+
+;; elscreen should be placed begin of https://github.com/knu/elscreen/issues/6
+;(elscreen-start)
+;(require 'init-elscreen)
+;(require 'elscreen)
+;(custom-set-faces
+; '(elscreen-tab-current-screen-face ((t (:background "Yellow" :foreground "black"))))
+; '(elscreen-tab-other-screen-face ((t (:background "gray22" :foreground "black")))))
+
+
+
+
+
 (provide 'init-elscreen)

diff --git a/emacs.d/config/init-ido.el b/emacs.d/config/init-ido.el
new file mode 100644 (file)
index 0000000..0f0ca0b
--- /dev/null
+++ b/emacs.d/config/init-ido.el
@@ -0,0 +1,25 @@
+
+;---------------------------------------------------------------------------------------
+;; 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)
+
+
+(provide 'init-ido)

diff --git a/emacs.d/config/init-magit.el b/emacs.d/config/init-magit.el
new file mode 100644 (file)
index 0000000..792e8ab
--- /dev/null
+++ b/emacs.d/config/init-magit.el
@@ -0,0 +1,10 @@
+;;---------------------------------------------------------------------------------------
+;; Magit
+;;
+(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)
+
+
+(provide 'init-magit)

diff --git a/emacs.d/config/init-org.el b/emacs.d/config/init-org.el
new file mode 100644 (file)
index 0000000..6d23722
--- /dev/null
+++ b/emacs.d/config/init-org.el
@@ -0,0 +1,23 @@
+
+;;; org-mode init File
+
+;; refer http://doc.norang.ca/org-mode.html
+
+
+;;;
+;;; Org Mode
+;;;
+;(add-to-list 'load-path (expand-file-name "~/git/org-mode/lisp"))
+(add-to-list 'auto-mode-alist '("\\.\\(org\\|org_archive\\|txt\\)$" . org-mode))
+(require 'org)
+;;
+;; Standard key bindings
+(global-set-key "\C-cl" 'org-store-link)
+(global-set-key "\C-ca" 'org-agenda)
+(global-set-key "\C-cb" 'org-iswitchb)
+
+
+(add-hook 'org-mode-hook
+          (lambda ()
+                      (org-set-local 'yas/trigger-key [tab])
+                      (define-key yas/keymap [tab] 'yas/next-field-or-maybe-expand)))

diff --git a/emacs.d/config/init-project.el b/emacs.d/config/init-project.el
new file mode 100644 (file)
index 0000000..9d4a8d7
--- /dev/null
+++ b/emacs.d/config/init-project.el
@@ -0,0 +1,19 @@
+
+
+(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)
+
+
+
+(require 'projectile)
+(projectile-global-mode)
+(setq projectile-enable-caching t)
+
+
+(require 'projectile-speedbar)
+
+
+(provide 'init-project)

diff --git a/emacs.d/init.el b/emacs.d/init.el
index 0a58966..fc7fee9 100644 (file)
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -9,118 +9,25 @@
 
 (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" ))
-(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)
-
-
-(add-to-list 'auto-mode-alist '("emacs\\'" . emacs-lisp-mode))
-
-
-
-;;; 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)
 
-;; elscreen should be placed begin of https://github.com/knu/elscreen/issues/6
-;(elscreen-start)
-;(require 'init-elscreen)
-;(require 'elscreen)
-;(custom-set-faces
-; '(elscreen-tab-current-screen-face ((t (:background "Yellow" :foreground "black"))))
-; '(elscreen-tab-other-screen-face ((t (:background "gray22" :foreground "black")))))
+(require 'init-base)
 
+(require 'my-packages)
 
 (require 'init-color-theme)
 
+(require 'init-ido)
 
-;---------------------------------------------------------------------------------------
-;; 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")
-(global-set-key (kbd "C-x g") 'magit-status)
-;(setq magit-auto-revert-mode nil)
-
+(require 'init-magit)
 
 (require 'init-evil)
 
+(require 'init-project)
 
-
-;;---------------------------------------------------------------------------------------
-;; 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)
-
-
-;;---------------------------------------------------------------------------------------
-;; sr-speedbar
-;;
-;(require 'sr-speedbar)
-;(setq speedbar-use-images nil)
-;(setq speedbar-show-unknown-files t)
-
-
-
-
-(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)
 
@@ -148,30 +55,6 @@
 
 
 
-;(require 'minibuffer-tray)
-;(require 'eyebrowse)
-;(eyebrowse-mode t)
-
-
-
-;;(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 ")))))
-
 
 
 
@@ -192,7 +75,7 @@
 
 
 
-(require 'evil-escape)
+;;;;;(require 'escape)
 ;(setq-default evil-escape-delay 0.2)  
 ;(setq evil-escape-excluded-major-modes '(dired-mode))
 ;(setq-default evil-escape-key-sequence "jj")
@@ -242,37 +125,37 @@
      (ruby-mode
       ("\\(\\\\\\([0-7]\\{1,3\\}\\|x[[:xdigit:]]\\{1,2\\}\\|u\\(?:[[:xdigit:]]\\{4\\}\\|{[[:xdigit:]]\\{1,6\\}\\(?:[[:space:]]+[[:xdigit:]]\\{1,6\\}\\)*}\\)\\|.\\)\\)"
        (0
-       (let*
-           ((state
-             (syntax-ppss))
-            (term
-             (nth 3 state)))
-         (when
-             (or
-              (and
-               (eq term 39)
-               (member
-                (match-string 2)
-                (quote
-                 ("\\" "'"))))
-              (if
-                  (fboundp
-                   (quote ruby-syntax-expansion-allowed-p))
-                  (ruby-syntax-expansion-allowed-p state)
-                (memq term
-                      (quote
-                       (34 47 10 96 t)))))
-           (add-face-text-property
-            (match-beginning 1)
-            (match-end 1)
-            (quote hes-escape-backslash-face))
-           (add-face-text-property
-            (match-beginning 2)
-            (match-end 2)
-            (quote hes-escape-sequence-face))
-           nil))
-       prepend))))))
- '(org-agenda-files (quote ("~/temp/org-note.org")))
+        (let*
+            ((state
+              (syntax-ppss))
+             (term
+              (nth 3 state)))
+          (when
+              (or
+               (and
+                (eq term 39)
+                (member
+                 (match-string 2)
+                 (quote
+                  ("\\" "'"))))
+               (if
+                   (fboundp
+                    (quote ruby-syntax-expansion-allowed-p))
+                   (ruby-syntax-expansion-allowed-p state)
+                 (memq term
+                       (quote
+                        (34 47 10 96 t)))))
+            (add-face-text-property
+             (match-beginning 1)
+             (match-end 1)
+             (quote hes-escape-backslash-face))
+            (add-face-text-property
+             (match-beginning 2)
+             (match-end 2)
+             (quote hes-escape-sequence-face))
+            nil))
+        prepend))))))
+ '(org-agenda-files (quote ("~/Private/org/diary.org" "~/temp/org-note.org")))
  '(powerline-text-scale-factor 0.85))
 
 ;; maybe better to fix the size of line number rather scaled 0.8
@@ -282,6 +165,9 @@
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
+ '(highlight-current-line-face ((t (:background "gray22"))))
+ '(linum ((t (:background "#000000" :foreground "gray40" :height 0.8 :slant italic :weigth light))))
+ '(linum-relative-current-face ((t (:inherit linum :foreground "Yellow" :weight light :height 0.8))))
  '(mode-line ((t (:foreground "#030303" :background "#bdbdbd" :box nil :family "Source Code Pro for Powerline" :height 100))))
  '(mode-line-inactive ((t (:foreground "#f9f9f9" :background "#666666" :box nil :family "Source Code Pro for Powerline" :height 100)))))
 
@@ -297,19 +183,6 @@
 
 
 
-;(defun pl-fringe-mode ()
-;  "jfoewoif"
-;  (if linum-mode
-;      (fringe-mode '(4 . 0))
-;    (fringe-mode '(0 . 0))))
-
-
-;(add-hook 'eshell-mode-hook 'pl-fringe-mode)
-;(add-hook 'prog-mode-hook 'pl-fringe-mode)
-
-
-
-
 
 (require 'workgroups2)
 
@@ -336,7 +209,7 @@
 (put 'hes-escape-sequence-face 'face-alias 'font-lock-builtin-face)
 
 
-(add-to-list 'load-path "~/.emacs.d/Emacs-PDE-0.2.16/lisp/")
-(load "pde-load")
+;(add-to-list 'load-path "~/.emacs.d/Emacs-PDE-0.2.16/lisp/")
+;(load "pde-load")                       ;
 
 (require 'init-linum)