5 files changed, 152 insertions, 30 deletions
diff --git a/.emacs.d/#init.el# b/.emacs.d/#init.el#
new file mode 100644
index 0000000..3c9fcf7
--- /dev/null
+++ b/.emacs.d/#init.el#
@@ -0,0 +1,69 @@
+;;; package --- My .emacs.d init. 2017.12.12
+;;; Commentary:
+;; -*- coding: utf-8 -*-
+
+;;; Code:
+
+;; Base config
+
+;; 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)
+
+(set debug-on-error t)
+
+;; Path
+(add-to-list 'load-path (expand-file-name "lisp" user-emacs-directory))
+
+(menu-bar-mode -1)
+(tool-bar-mode -1)
+(scroll-bar-mode -1)
+(blink-cursor-mode -1)
+
+
+;; Line number
+;; (global-linum-mode 1)
+;; Highlight current line
+(when window-system
+  (global-hl-line-mode))
+;; Disable visual bell
+(setq ring-bell-function 'ignore)
+;; Transparent
+;;(set-frame-parameter (selected-frame) 'alpha '(85 . 50))
+;;(add-to-list 'default-frame-alist '(alpha . (85 . 50)))
+
+;; Personal information
+(setq user-full-name "李向阳 141160029"
+      user-mail-address "me@xiangyangli.com")
+
+;; Bootstrap
+(setq custom-file (expand-file-name "custom.el" user-emacs-directory))
+(require 'init-elpa)
+
+(setq emacs-load-start-time (current-time))
+
+;; Theme
+(load-theme 'misterioso t)
+;; Make highlight color differ from the highlight line
+(set-face-attribute 'region nil :background "#213")
+
+(let ((file-name-handler-alist nil))
+  (require 'init-evil)
+  (require 'init-org)
+  (require 'init-program-basic)
+  (require 'init-company)
+  (require 'init-flycheck)
+  (require 'init-expand-region)
+  (require 'init-helm)
+  (require 'init-window-numbering))
+
+;;----------------------------------------------------------------------------
+;; Variables configured via the interactive 'customize' interface
+;;----------------------------------------------------------------------------
+(when (file-exists-p custom-file)
+  (load custom-file))
+
+(provide 'init)
+;;; init.el ends here
diff --git a/.emacs.d/auto-save-list/.saves-859-steve~ b/.emacs.d/auto-save-list/.saves-859-steve~
new file mode 100644
index 0000000..cb085fa
--- /dev/null
+++ b/.emacs.d/auto-save-list/.saves-859-steve~
@@ -0,0 +1,2 @@
+/home/steve/tmp/review/ctrip/ctrip.py
+/home/steve/tmp/review/ctrip/#ctrip.py#
diff --git a/.emacs.d/custom.el b/.emacs.d/custom.el
new file mode 100644
index 0000000..29b92da
--- /dev/null
+++ b/.emacs.d/custom.el
@@ -0,0 +1,27 @@
+;;; company --- All custom configuration
+
+;;; Commentary:
+
+;;; Code:
+
+(custom-set-variables
+ ;; custom-set-variables was added by Custom.
+ ;; 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.
+ '(browse-url-firefox-arguments nil)
+ '(browse-url-firefox-new-window-is-tab nil)
+ '(browse-url-firefox-program "firefox-esr")
+ '(custom-safe-themes
+   (quote
+	("4486ade2acbf630e78658cd6235a5c6801090c2694469a2a2b4b0e12227a64b9" "66881e95c0eda61d34aa7f08ebacf03319d37fe202d68ecf6a1dbfd49d664bc3" default)))
+ '(inhibit-startup-screen t)
+ '(package-selected-packages
+   (quote
+	(scala-mode helm expand-region window-numbering flycheck company oceanic-theme forest-blue-theme org ## evil))))
+(custom-set-faces
+ ;; custom-set-faces was added by Custom.
+ ;; 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.
+ )
diff --git a/.emacs.d/custom.el~ b/.emacs.d/custom.el~
new file mode 100644
index 0000000..29b92da
--- /dev/null
+++ b/.emacs.d/custom.el~
@@ -0,0 +1,27 @@
+;;; company --- All custom configuration
+
+;;; Commentary:
+
+;;; Code:
+
+(custom-set-variables
+ ;; custom-set-variables was added by Custom.
+ ;; 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.
+ '(browse-url-firefox-arguments nil)
+ '(browse-url-firefox-new-window-is-tab nil)
+ '(browse-url-firefox-program "firefox-esr")
+ '(custom-safe-themes
+   (quote
+	("4486ade2acbf630e78658cd6235a5c6801090c2694469a2a2b4b0e12227a64b9" "66881e95c0eda61d34aa7f08ebacf03319d37fe202d68ecf6a1dbfd49d664bc3" default)))
+ '(inhibit-startup-screen t)
+ '(package-selected-packages
+   (quote
+	(scala-mode helm expand-region window-numbering flycheck company oceanic-theme forest-blue-theme org ## evil))))
+(custom-set-faces
+ ;; custom-set-faces was added by Custom.
+ ;; 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.
+ )
diff --git a/.emacs.d/init.el~ b/.emacs.d/init.el~
index 21e091f..7399dac 100644
--- a/.emacs.d/init.el~
+++ b/.emacs.d/init.el~
@@ -5,12 +5,26 @@
 ;;; Code:
 
 ;; Base config
+
+;; 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)
+
+(setq debug-on-error t)
+
+;; Path
+(add-to-list 'load-path (expand-file-name "lisp" user-emacs-directory))
+
 (menu-bar-mode -1)
 (tool-bar-mode -1)
 (scroll-bar-mode -1)
 (blink-cursor-mode -1)
+
+
 ;; Line number
-(global-linum-mode 1)
+;; (global-linum-mode 1)
 ;; Highlight current line
 (when window-system
   (global-hl-line-mode))
@@ -24,39 +38,16 @@
 (setq user-full-name "李向阳 141160029"
       user-mail-address "me@xiangyangli.com")
 
-;; Package
-(require 'package)
-(add-to-list 'package-archives '("melpa" . "http://melpa.org/packages/"))
-(package-initialize)
-(custom-set-variables
- ;; custom-set-variables was added by Custom.
- ;; 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.
- '(browse-url-firefox-arguments nil)
- '(browse-url-firefox-new-window-is-tab nil)
- '(browse-url-firefox-program "firefox-esr")
- '(custom-safe-themes
-   (quote
-	("4486ade2acbf630e78658cd6235a5c6801090c2694469a2a2b4b0e12227a64b9" "66881e95c0eda61d34aa7f08ebacf03319d37fe202d68ecf6a1dbfd49d664bc3" default)))
- '(inhibit-startup-screen t)
- '(package-selected-packages
-   (quote
-	(scala-mode helm expand-region window-numbering flycheck company oceanic-theme forest-blue-theme org ## evil))))
-(custom-set-faces
- ;; custom-set-faces was added by Custom.
- ;; 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.
- )
+;; Bootstrap
+(setq custom-file (expand-file-name "custom.el" user-emacs-directory))
 
-(setq emacs-load-start-time (current-time))
-(add-to-list 'load-path (expand-file-name "~/.emacs.d/lisp"))
+(require 'init-elpa)
+;; (setq emacs-load-start-time (current-time))
 
 ;; Theme
-;; (load-theme 'oceanic t)
+(load-theme 'misterioso t)
 ;; Make highlight color differ from the highlight line
-(set-face-attribute 'region nil :background "#213")
+;; (set-face-attribute 'region nil :background "#213")
 
 (let ((file-name-handler-alist nil))
   (require 'init-evil)
@@ -68,5 +59,11 @@
   (require 'init-helm)
   (require 'init-window-numbering))
 
+;;----------------------------------------------------------------------------
+;; Variables configured via the interactive 'customize' interface
+;;----------------------------------------------------------------------------
+(when (file-exists-p custom-file)
+  (load custom-file))
+
 (provide 'init)
 ;;; init.el ends here