19 files changed, 92 insertions, 85 deletions
diff --git a/.emacs.d/#init.el# b/.emacs.d/#init.el#
deleted file mode 100644
index 3c9fcf7..0000000
--- a/.emacs.d/#init.el#
+++ /dev/null
@@ -1,69 +0,0 @@
-;;; 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-1063-steve~ b/.emacs.d/auto-save-list/.saves-1063-steve~
new file mode 100644
index 0000000..5c12ae2
--- /dev/null
+++ b/.emacs.d/auto-save-list/.saves-1063-steve~
@@ -0,0 +1,8 @@
+/home/steve/tmp/review/Lao_Lao/ctrip.py
+/home/steve/tmp/review/Lao_Lao/#ctrip.py#
+/home/steve/tmp/review/Fiesta_Resort/ctrip.py
+/home/steve/tmp/review/Fiesta_Resort/#ctrip.py#
+/home/steve/tmp/review/Hyatt/ctrip.py
+/home/steve/tmp/review/Hyatt/#ctrip.py#
+/home/steve/tmp/review/Kensington_Hotel_Saipan/ctrip.py
+/home/steve/tmp/review/Kensington_Hotel_Saipan/#ctrip.py#
diff --git a/.emacs.d/auto-save-list/.saves-1119-steve~ b/.emacs.d/auto-save-list/.saves-1119-steve~
new file mode 100644
index 0000000..fe9f0ec
--- /dev/null
+++ b/.emacs.d/auto-save-list/.saves-1119-steve~
@@ -0,0 +1,8 @@
+/home/steve/tmp/Final/141160029李向阳/solution_4.py
+/home/steve/tmp/Final/141160029李向阳/#solution_4.py#
+/home/steve/tmp/Final/141160029李向阳/solution_3.py
+/home/steve/tmp/Final/141160029李向阳/#solution_3.py#
+/home/steve/tmp/Final/141160029李向阳/solution_2.py
+/home/steve/tmp/Final/141160029李向阳/#solution_2.py#
+/home/steve/tmp/Final/141160029李向阳/solution_1.py
+/home/steve/tmp/Final/141160029李向阳/#solution_1.py#
diff --git a/.emacs.d/auto-save-list/.saves-1187-steve~ b/.emacs.d/auto-save-list/.saves-1187-steve~
new file mode 100644
index 0000000..893dee7
--- /dev/null
+++ b/.emacs.d/auto-save-list/.saves-1187-steve~
@@ -0,0 +1,6 @@
+/home/steve/Code/env_model/Model.py
+/home/steve/Code/env_model/#Model.py#
+/home/steve/Code/env_model/DatabaseManager.py
+/home/steve/Code/env_model/#DatabaseManager.py#
+/home/steve/Code/env_model/sql.py
+/home/steve/Code/env_model/#sql.py#
diff --git a/.emacs.d/auto-save-list/.saves-1490-steve~ b/.emacs.d/auto-save-list/.saves-1490-steve~
new file mode 100644
index 0000000..550b8ed
--- /dev/null
+++ b/.emacs.d/auto-save-list/.saves-1490-steve~
@@ -0,0 +1,4 @@
+/home/steve/Code/env_model/main.py
+/home/steve/Code/env_model/#main.py#
+/home/steve/Code/env_model/Model.py
+/home/steve/Code/env_model/#Model.py#
diff --git a/.emacs.d/auto-save-list/.saves-2594-steve~ b/.emacs.d/auto-save-list/.saves-2594-steve~
new file mode 100644
index 0000000..5152968
--- /dev/null
+++ b/.emacs.d/auto-save-list/.saves-2594-steve~
@@ -0,0 +1,2 @@
+/home/steve/.emacs.d/init.el
+/home/steve/.emacs.d/#init.el#
diff --git a/.emacs.d/auto-save-list/.saves-4830-steve~ b/.emacs.d/auto-save-list/.saves-4830-steve~
new file mode 100644
index 0000000..ffcd50d
--- /dev/null
+++ b/.emacs.d/auto-save-list/.saves-4830-steve~
@@ -0,0 +1,2 @@
+/home/steve/tmp/review/Kensington_Hotel_Saipan/ctrip.py
+/home/steve/tmp/review/Kensington_Hotel_Saipan/#ctrip.py#
diff --git a/.emacs.d/auto-save-list/.saves-655-steve~ b/.emacs.d/auto-save-list/.saves-655-steve~
new file mode 100644
index 0000000..550b8ed
--- /dev/null
+++ b/.emacs.d/auto-save-list/.saves-655-steve~
@@ -0,0 +1,4 @@
+/home/steve/Code/env_model/main.py
+/home/steve/Code/env_model/#main.py#
+/home/steve/Code/env_model/Model.py
+/home/steve/Code/env_model/#Model.py#
diff --git a/.emacs.d/auto-save-list/.saves-833-steve~ b/.emacs.d/auto-save-list/.saves-833-steve~
new file mode 100644
index 0000000..a91f696
--- /dev/null
+++ b/.emacs.d/auto-save-list/.saves-833-steve~
@@ -0,0 +1,2 @@
+/home/steve/Code/env_model/main.py
+/home/steve/Code/env_model/#main.py#
diff --git a/.emacs.d/custom.el b/.emacs.d/custom.el
index bbbc261..18431b0 100644
--- a/.emacs.d/custom.el
+++ b/.emacs.d/custom.el
@@ -12,7 +12,7 @@
  '(inhibit-startup-screen t)
  '(package-selected-packages
    (quote
-	(evil window-numbering scala-mode oceanic-theme neotree helm flycheck expand-region evil-leader company))))
+	(slime evil window-numbering scala-mode oceanic-theme neotree helm flycheck expand-region evil-leader company))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/.emacs.d/custom.el~ b/.emacs.d/custom.el~
index bbbc261..18431b0 100644
--- a/.emacs.d/custom.el~
+++ b/.emacs.d/custom.el~
@@ -12,7 +12,7 @@
  '(inhibit-startup-screen t)
  '(package-selected-packages
    (quote
-	(evil window-numbering scala-mode oceanic-theme neotree helm flycheck expand-region evil-leader company))))
+	(slime evil window-numbering scala-mode oceanic-theme neotree helm flycheck expand-region evil-leader company))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index f0f0a01..1375205 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -11,7 +11,6 @@
 ;; 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
@@ -25,9 +24,6 @@
 
 ;; 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
@@ -53,12 +49,17 @@
   (require 'init-expand-region)
   (require 'init-helm)
   (require 'init-neotree)
+  (require 'init-slime)
   (require 'init-window-numbering))
 
 ;; Theme
 (load-theme 'misterioso t)
 ;; Make highlight color differ from the highlight line
-(set-face-attribute 'region nil :background "#213")
+
+;; Highlight current line, and keep syntax hightlight(:interit nil)
+(when window-system
+  (global-hl-line-mode))
+(set-face-attribute 'hl-line nil :inherit nil :background "gray13")
 
 ;;----------------------------------------------------------------------------
 ;; Variables configured via the interactive 'customize' interface
diff --git a/.emacs.d/init.el~ b/.emacs.d/init.el~
index c63707d..99dffce 100644
--- a/.emacs.d/init.el~
+++ b/.emacs.d/init.el~
@@ -11,7 +11,6 @@
 ;; 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
@@ -25,9 +24,6 @@
 
 ;; 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
@@ -52,12 +48,17 @@
   (require 'init-flycheck)
   (require 'init-expand-region)
   (require 'init-helm)
+  (require 'init-neotree)
   (require 'init-window-numbering))
 
 ;; Theme
 (load-theme 'misterioso t)
 ;; Make highlight color differ from the highlight line
-(set-face-attribute 'region nil :background "#213")
+
+;; Highlight current line, and keep syntax hightlight(:interit nil)
+(when window-system
+  (global-hl-line-mode))
+(set-face-attribute 'hl-line nil :inherit nil :background "gray13")
 
 ;;----------------------------------------------------------------------------
 ;; Variables configured via the interactive 'customize' interface
diff --git a/.emacs.d/lisp/init-evil.el b/.emacs.d/lisp/init-evil.el
index 2b2a745..7463dd0 100644
--- a/.emacs.d/lisp/init-evil.el
+++ b/.emacs.d/lisp/init-evil.el
@@ -10,10 +10,12 @@
 (require 'evil)
 (evil-mode 1)
 
-;; todo function and keybinding to open file in new window
+;; TODO function and keybinding to open file in new window
+;; TODO combined keybindings
 
 (evil-leader/set-leader ";")
 (evil-leader/set-key
+  "ss" 'evil-scroll-line-down
   "s" 'save-buffer
   "c" 'execute-c-program
   "e" 'find-file
@@ -22,6 +24,7 @@
   "e" 'er/expand-region
   "f" 'google-search
   "t" 'test-function
+  "p" 'execute-python-program
 
   ;; switch window
   "0" 'select-window-0
diff --git a/.emacs.d/lisp/init-evil.el~ b/.emacs.d/lisp/init-evil.el~
index 7c21575..6e3ecbd 100644
--- a/.emacs.d/lisp/init-evil.el~
+++ b/.emacs.d/lisp/init-evil.el~
@@ -10,12 +10,12 @@
 (require 'evil)
 (evil-mode 1)
 
-;; todo function and keybinding to open file in new window
+;; TODO function and keybinding to open file in new window
+;; TODO combined keybindings
 
 (evil-leader/set-leader ";")
 (evil-leader/set-key
-  "aa" 'google-search
-  "a" 'save-buffer
+  "ss" 'evil-scroll-line-down
   "s" 'save-buffer
   "c" 'execute-c-program
   "e" 'find-file
diff --git a/.emacs.d/lisp/init-program-basic.el b/.emacs.d/lisp/init-program-basic.el
index 04266aa..70bab79 100644
--- a/.emacs.d/lisp/init-program-basic.el
+++ b/.emacs.d/lisp/init-program-basic.el
@@ -9,6 +9,14 @@
 	      tab-width 4
 	      indent-tabs-mode t)
 
+(defun execute-python-program ()
+  "run current python script."
+  (interactive)
+  (save-buffer)
+  (defvar foo)
+  (setq foo (concat "python " (buffer-name)))
+  (shell-command foo))
+
 (defun execute-c-program ()
   "Complie current c file and run it."
   (interactive)
diff --git a/.emacs.d/lisp/init-program-basic.el~ b/.emacs.d/lisp/init-program-basic.el~
index 1e852ad..04266aa 100644
--- a/.emacs.d/lisp/init-program-basic.el~
+++ b/.emacs.d/lisp/init-program-basic.el~
@@ -12,6 +12,7 @@
 (defun execute-c-program ()
   "Complie current c file and run it."
   (interactive)
+  (save-buffer)
   (defvar foo)
   (setq foo (concat
 			 "gcc " (include-source-file (buffer-name)) " -o " (buffer-name) ".out && ./" (buffer-name) ".out" ))
diff --git a/.emacs.d/lisp/init-slime.el b/.emacs.d/lisp/init-slime.el
new file mode 100644
index 0000000..157f0ee
--- /dev/null
+++ b/.emacs.d/lisp/init-slime.el
@@ -0,0 +1,13 @@
+;;; slime --- All slime configuration
+
+;;; Commentary:
+
+;;; Code:
+
+(package-install 'slime)
+
+(setq inferior-lisp-program "/usr/bin/sbcl")
+(setq slime-contribs '(slime-fancy))
+
+(provide 'init-slime)
+;;; init-slime ends here
diff --git a/.emacs.d/lisp/init-slime.el~ b/.emacs.d/lisp/init-slime.el~
new file mode 100644
index 0000000..28258b9
--- /dev/null
+++ b/.emacs.d/lisp/init-slime.el~
@@ -0,0 +1,13 @@
+;;; slime --- All slime configuration
+
+;;; Commentary:
+
+;;; Code:
+
+(package-install 'slime)
+
+(setq inferior-lisp-program "/opt/sbcl/bin/sbcl")
+(setq slime-contribs '(slime-fancy))
+
+(provide 'init-slime)
+;;; init-slime ends here