diff options
Diffstat (limited to '.emacs.d')
| -rw-r--r-- | .emacs.d/init.el | 20 | ||||
| -rw-r--r-- | .emacs.d/init.el~ | 23 | ||||
| -rw-r--r-- | .emacs.d/lisp/init-company.el | 10 | ||||
| -rw-r--r-- | .emacs.d/lisp/init-company.el~ | 0 | ||||
| -rw-r--r-- | .emacs.d/lisp/init-evil.el | 25 | ||||
| -rw-r--r-- | .emacs.d/lisp/init-evil.el~ | 24 | ||||
| -rw-r--r-- | .emacs.d/lisp/init-flycheck.el | 13 | ||||
| -rw-r--r-- | .emacs.d/lisp/init-flycheck.el~ | 13 | ||||
| -rw-r--r-- | .emacs.d/lisp/init-org.el | 9 | ||||
| -rw-r--r-- | .emacs.d/lisp/init-org.el~ | 2 | ||||
| -rw-r--r-- | .emacs.d/lisp/init-program-basic.el | 9 | ||||
| -rw-r--r-- | .emacs.d/lisp/init-program-basic.el~ | 7 | ||||
| -rw-r--r-- | .emacs.d/lisp/init-window-numbering.el | 10 | ||||
| -rw-r--r-- | .emacs.d/lisp/init-window-numbering.el~ | 3 |
14 files changed, 152 insertions, 16 deletions
diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 51bba67..6ce7dee 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -1,3 +1,9 @@ +;;; package --- My .emacs.d init. 2017.12.12 +;;; Commentary: +;; -*- coding: utf-8 -*- + +;;; Code: + ;; Base config (menu-bar-mode -1) (tool-bar-mode -1) @@ -29,9 +35,11 @@ ;; If there is more than one, they won't work right. '(custom-safe-themes (quote - ("4486ade2acbf630e78658cd6235a5c6801090c2694469a2a2b4b0e12227a64b9" "66881e95c0eda61d34aa7f08ebacf03319d37fe202d68ecf6a1dbfd49d664bc3" default))) + ("4486ade2acbf630e78658cd6235a5c6801090c2694469a2a2b4b0e12227a64b9" "66881e95c0eda61d34aa7f08ebacf03319d37fe202d68ecf6a1dbfd49d664bc3" default))) '(inhibit-startup-screen t) - '(package-selected-packages (quote (oceanic-theme forest-blue-theme org ## evil)))) + '(package-selected-packages + (quote + (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. @@ -48,4 +56,10 @@ (let ((file-name-handler-alist nil)) (require 'init-evil) (require 'init-org) - (require 'init-program-basic)) + (require 'init-program-basic) + (require 'init-company) + (require 'init-flycheck) + (require 'init-window-numbering)) + +(provide 'init) +;;; init.el ends here diff --git a/.emacs.d/init.el~ b/.emacs.d/init.el~ index e6289a8..3261777 100644 --- a/.emacs.d/init.el~ +++ b/.emacs.d/init.el~ @@ -1,3 +1,9 @@ +;;; package --- My .emacs.d init. 2017.12.12 +;;; Commentary: +;; -*- coding: utf-8 -*- + +;;; Code: + ;; Base config (menu-bar-mode -1) (tool-bar-mode -1) @@ -29,9 +35,11 @@ ;; If there is more than one, they won't work right. '(custom-safe-themes (quote - ("4486ade2acbf630e78658cd6235a5c6801090c2694469a2a2b4b0e12227a64b9" "66881e95c0eda61d34aa7f08ebacf03319d37fe202d68ecf6a1dbfd49d664bc3" default))) + ("4486ade2acbf630e78658cd6235a5c6801090c2694469a2a2b4b0e12227a64b9" "66881e95c0eda61d34aa7f08ebacf03319d37fe202d68ecf6a1dbfd49d664bc3" default))) '(inhibit-startup-screen t) - '(package-selected-packages (quote (oceanic-theme forest-blue-theme org ## evil)))) + '(package-selected-packages + (quote + (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. @@ -47,9 +55,10 @@ (let ((file-name-handler-alist nil)) (require 'init-evil) - (require 'init-org)) + (require 'init-org) + (require 'init-program-basic) + (require 'init-company) + (require 'init-flycheck)) -;; C programming -(setq-default c-basic-offset 4 - tab-width 4 - indent-tabs-mode t) +(provide 'init) +;;; init.el ends here diff --git a/.emacs.d/lisp/init-company.el b/.emacs.d/lisp/init-company.el new file mode 100644 index 0000000..c6579b4 --- /dev/null +++ b/.emacs.d/lisp/init-company.el @@ -0,0 +1,10 @@ +;;; company --- All company configuration + +;;; Commentary: + +;;; Code: + +(global-company-mode) + +(provide 'init-company) +;;; init-company ends here diff --git a/.emacs.d/lisp/init-company.el~ b/.emacs.d/lisp/init-company.el~ new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/.emacs.d/lisp/init-company.el~ diff --git a/.emacs.d/lisp/init-evil.el b/.emacs.d/lisp/init-evil.el index ca06590..0c25450 100644 --- a/.emacs.d/lisp/init-evil.el +++ b/.emacs.d/lisp/init-evil.el @@ -1,7 +1,15 @@ -;; Evil mode +;;; init-evil --- All config of evil-mode + +;;; Commentary: + +;;; Code: + +(package-install 'evil) (require 'evil) (evil-mode 1) +;; todo function and keybinding to open file in new window + ;; Evil leader, more evil (global-evil-leader-mode) (evil-leader/set-leader ";") @@ -10,6 +18,19 @@ "c" 'execute-c-program "e" 'find-file "b" 'switch-to-buffer - "q" 'kill-buffer) + "q" 'kill-buffer + + ;; switch window + "0" 'select-window-0 + "1" 'select-window-1 + "2" 'select-window-2 + "3" 'select-window-3 + "4" 'select-window-4 + "5" 'select-window-5 + "6" 'select-window-6 + "7" 'select-window-7 + "8" 'select-window-8 + "9" 'select-window-9) (provide 'init-evil) +;;; init-evil ends here diff --git a/.emacs.d/lisp/init-evil.el~ b/.emacs.d/lisp/init-evil.el~ index 35d96e0..375f5cc 100644 --- a/.emacs.d/lisp/init-evil.el~ +++ b/.emacs.d/lisp/init-evil.el~ @@ -1,4 +1,10 @@ -;; Evil mode +;;; init-evil --- All config of evil-mode + +;;; Commentary: + +;;; Code: + +(package-install 'evil) (require 'evil) (evil-mode 1) @@ -7,8 +13,22 @@ (evil-leader/set-leader ";") (evil-leader/set-key "s" 'save-buffer + "c" 'execute-c-program "e" 'find-file "b" 'switch-to-buffer - "q" 'kill-buffer) + "q" 'kill-buffer + + ;; switch window + "0" 'select-window-0 + "1" 'select-window-1 + "2" 'select-window-2 + "3" 'select-window-3 + "4" 'select-window-4 + "5" 'select-window-5 + "6" 'select-window-6 + "7" 'select-window-7 + "8" 'select-window-8 + "9" 'select-window-9) (provide 'init-evil) +;;; init-evil ends here diff --git a/.emacs.d/lisp/init-flycheck.el b/.emacs.d/lisp/init-flycheck.el new file mode 100644 index 0000000..d124711 --- /dev/null +++ b/.emacs.d/lisp/init-flycheck.el @@ -0,0 +1,13 @@ +;;; flycheck --- All flycheck configuration + +;;; Commentary: + +;;; Code: + +(package-install 'flycheck) + +(global-flycheck-mode) +(setq flycheck-check-syntax-automatically '(mode-enabled save)) + +(provide 'init-flycheck) +;;; init-flycheck ends here diff --git a/.emacs.d/lisp/init-flycheck.el~ b/.emacs.d/lisp/init-flycheck.el~ new file mode 100644 index 0000000..d124711 --- /dev/null +++ b/.emacs.d/lisp/init-flycheck.el~ @@ -0,0 +1,13 @@ +;;; flycheck --- All flycheck configuration + +;;; Commentary: + +;;; Code: + +(package-install 'flycheck) + +(global-flycheck-mode) +(setq flycheck-check-syntax-automatically '(mode-enabled save)) + +(provide 'init-flycheck) +;;; init-flycheck ends here diff --git a/.emacs.d/lisp/init-org.el b/.emacs.d/lisp/init-org.el index b162f12..189cf79 100644 --- a/.emacs.d/lisp/init-org.el +++ b/.emacs.d/lisp/init-org.el @@ -1,4 +1,10 @@ -;; org-mode pdf outpuf +;;; org --- All configuration of org-mode + +;;; Commentary: +;; Mostly the pdf export configuration + +;;; Code: + (setq org-latex-classes '(("article" " @@ -35,3 +41,4 @@ "xelatex -interaction nonstopmode -output-directory %o %f")) (provide 'init-org) +;;; init-org ends here diff --git a/.emacs.d/lisp/init-org.el~ b/.emacs.d/lisp/init-org.el~ index 6409de9..b162f12 100644 --- a/.emacs.d/lisp/init-org.el~ +++ b/.emacs.d/lisp/init-org.el~ @@ -33,3 +33,5 @@ '("xelatex -interaction nonstopmode -output-directory %o %f" "xelatex -interaction nonstopmode -output-directory %o %f" "xelatex -interaction nonstopmode -output-directory %o %f")) + +(provide 'init-org) diff --git a/.emacs.d/lisp/init-program-basic.el b/.emacs.d/lisp/init-program-basic.el index 2e68074..092bd3c 100644 --- a/.emacs.d/lisp/init-program-basic.el +++ b/.emacs.d/lisp/init-program-basic.el @@ -1,4 +1,10 @@ -;; C programming +;;; program-basic --- Some basic configuration + +;;; Commentary: +;; None + +;;; Code: + (setq-default c-basic-offset 4 tab-width 4 indent-tabs-mode t) @@ -11,3 +17,4 @@ (shell-command foo)) (provide 'init-program-basic) +;;; init-program-basic ends here diff --git a/.emacs.d/lisp/init-program-basic.el~ b/.emacs.d/lisp/init-program-basic.el~ index db3455c..2e68074 100644 --- a/.emacs.d/lisp/init-program-basic.el~ +++ b/.emacs.d/lisp/init-program-basic.el~ @@ -3,4 +3,11 @@ tab-width 4 indent-tabs-mode t) +(defun execute-c-program () + (interactive) + (defvar foo) + (setq foo (concat + "gcc " (buffer-name) " -o " (buffer-name) ".out && ./" (buffer-name) ".out" )) + (shell-command foo)) + (provide 'init-program-basic) diff --git a/.emacs.d/lisp/init-window-numbering.el b/.emacs.d/lisp/init-window-numbering.el new file mode 100644 index 0000000..c8425ff --- /dev/null +++ b/.emacs.d/lisp/init-window-numbering.el @@ -0,0 +1,10 @@ +;;; window-numbering --- All configuration of window-numbering + +;;; Commentary: + +;;; Code: + +(window-numbering-mode) + +(provide 'init-window-numbering) +;;; init-window-numbering ends here diff --git a/.emacs.d/lisp/init-window-numbering.el~ b/.emacs.d/lisp/init-window-numbering.el~ new file mode 100644 index 0000000..cb3ccc8 --- /dev/null +++ b/.emacs.d/lisp/init-window-numbering.el~ @@ -0,0 +1,3 @@ +;;; window-numbering --- All configuration of window-numbering + +;;; C |
