merge emacs config

6 files changed, 30 insertions, 9 deletions

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 1375205..ca48879 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -1,8 +1,6 @@
 ;;; package --- My .emacs.d init. 2017.12.12
 ;;; Commentary:
-;; -*- coding: utf-8 -*-
-
-;;; Code:
+;; -*- coding: utf-8 -*- ;;; Code:
 
 ;; Base config
 
@@ -20,18 +18,19 @@
 (tool-bar-mode -1)
 (scroll-bar-mode -1)
 (blink-cursor-mode -1)
-
+(global-linum-mode 1)
+(setq inhibit-splash-screen 1)
 
 ;; Line number
 ;; (global-linum-mode 1)
 ;; 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)))
+(set-frame-parameter (selected-frame) 'alpha '(85 . 50))
+(add-to-list 'default-frame-alist '(alpha . (85 . 50)))
 
 ;; Personal information
-(setq user-full-name "李向阳 141160029"
+(setq user-full-name "Steve Lee"
       user-mail-address "me@xiangyangli.com")
 
 ;; Bootstrap
@@ -50,6 +49,9 @@
   (require 'init-helm)
   (require 'init-neotree)
   (require 'init-slime)
+  (require 'recentf)
+  (require 'init-rust)
+  (require 'init-lsp)
   (require 'init-window-numbering))
 
 ;; Theme
diff --git a/.emacs.d/lisp/c.c b/.emacs.d/lisp/c.c
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/.emacs.d/lisp/c.c
diff --git a/.emacs.d/lisp/init-evil.el b/.emacs.d/lisp/init-evil.el
index cd57a7e..05a462b 100644
--- a/.emacs.d/lisp/init-evil.el
+++ b/.emacs.d/lisp/init-evil.el
@@ -16,7 +16,6 @@
 
 (evil-leader/set-leader ";")
 (evil-leader/set-key
-  "ss" 'evil-scroll-line-down
   "s" 'save-buffer
   "c" 'execute-c-program
   "e" 'find-file
diff --git a/.emacs.d/lisp/init-lsp.el b/.emacs.d/lisp/init-lsp.el
new file mode 100644
index 0000000..c0cafcb
--- /dev/null
+++ b/.emacs.d/lisp/init-lsp.el
@@ -0,0 +1,10 @@
+;;; lsp --- All lsp configuration
+
+;;; Commentary:
+
+;;; Code:
+
+(require-package 'lsp-mode)
+
+(provide 'init-lsp)
+;;; init-lsp ends here
diff --git a/.emacs.d/lisp/init-program-basic.el b/.emacs.d/lisp/init-program-basic.el
index 70bab79..5bc89a9 100644
--- a/.emacs.d/lisp/init-program-basic.el
+++ b/.emacs.d/lisp/init-program-basic.el
@@ -10,7 +10,7 @@
 	      indent-tabs-mode t)
 
 (defun execute-python-program ()
-  "run current python script."
+  "Run current python script."
   (interactive)
   (save-buffer)
   (defvar foo)
diff --git a/.emacs.d/lisp/init-rust.el b/.emacs.d/lisp/init-rust.el
new file mode 100644
index 0000000..bd5adfb
--- /dev/null
+++ b/.emacs.d/lisp/init-rust.el
@@ -0,0 +1,10 @@
+;;; rust-mode --- All slime configuration
+
+;;; Commentary:
+
+;;; Code:
+
+(require-package 'rust-mode)
+
+(provide 'init-rust)
+;;; init-rust ends here