X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Fconfig.org;h=38a77d1b4ff172cd1db99a647595b2e609735acd;hb=57a51e1c109319591006d498904bf70ceff518d0;hp=d37dc9c582f303ac556bff9117334257b4835e36;hpb=56d07be9f7eb4e8970a9df4f00f63cf3fb2334c2;p=dotfiles.git diff --git a/emacs.d/config.org b/emacs.d/config.org index d37dc9c..38a77d1 100644 --- a/emacs.d/config.org +++ b/emacs.d/config.org @@ -54,6 +54,11 @@ Set system PATH and emacs exec path ;;supress the redefined warning at startup (setq ad-redefinition-action 'accept) + + (setq scroll-step 1) + (setq scroll-margin 5) + + (fringe-mode '(0 . 0)) #+END_SRC *** Custom file @@ -355,6 +360,11 @@ improve color for org-mode #+END_SRC +search text theme +#+BEGIN_SRC emacs-lisp :tangle yes :results silent + (set-face-attribute 'lazy-highlight nil :background "yellow" :foreground "black" :weight 'bold) +#+END_SRC + ** Rainbow-delimiter #+BEGIN_SRC emacs-lisp :tangle yes :results silent @@ -422,6 +432,8 @@ clean mode line, Refer to [[https://www.masteringemacs.org/article/hiding-replac (irony-mode . "") (page-break-lines-mode . "") (yas-minor-mode . "y") + ;; default jj + (evil-escape-mode . "") ;; Major modes (lisp-interaction-mode . "λ") (hi-lock-mode . "") @@ -545,6 +557,7 @@ Revised powerline-center-theme )) (center (list (powerline-raw " " face1) (funcall separator-left face1 face2) + (powerline-raw (when (and (boundp 'evil-mode) evil-mode) evil-mode-line-tag) face2) (when (and (boundp 'erc-track-minor-mode) erc-track-minor-mode) (powerline-raw erc-modified-channels-object face2 'l)) (powerline-major-mode face2 'l) @@ -789,9 +802,7 @@ use [[https://github.com/sabof/org-bullets][org-bullets]] package to show utf-8 (use-package org-bullets :ensure t :init - (add-hook 'org-mode-hook - (lambda () - (org-bullets-mode t)))) + (add-hook 'org-mode-hook (apply-partially #'org-bullets-mode t))) (setq org-bullets-bullet-list '("⦿" "✪" "◉" "○" "►" "◆")) @@ -1150,7 +1161,7 @@ extend org-mode's easy templates, refer to [[http://coldnew.github.io/coldnew-em (set-face-attribute 'variable-pitch nil :font "Source Sans Pro" :height 160) (set-face-attribute 'fixed-pitch nil :font "Source Code Pro" :height (face-attribute 'default :height)) - (add-hook 'text-mode-hook 'variable-pitch-mode) + ;; (add-hook 'text-mode-hook 'variable-pitch-mode) ;; Install Ubuntu Mono fonts and apply it in org-table to align Chinese fonts (with-eval-after-load "org" @@ -1179,18 +1190,18 @@ Also correct the face of =org-meta-line= in =org-table= *** Org-head face #+BEGIN_SRC emacs-lisp :tangle yes :results silent - (with-eval-after-load "org" - (let* ((base-height (face-attribute 'variable-pitch :height)) - (base-font-color (face-foreground 'default nil 'default))) - (set-face-attribute 'org-document-title nil :weight 'bold :height (+ 60 base-height)) - (set-face-attribute 'org-level-1 nil :weight 'bold :height (+ 40 base-height)) - (set-face-attribute 'org-level-2 nil :weight 'bold :height (+ 30 base-height)) - (set-face-attribute 'org-level-3 nil :weight 'bold :height (+ 20 base-height)) - (set-face-attribute 'org-level-4 nil :weight 'bold :height (+ 10 base-height)) - (set-face-attribute 'org-level-5 nil :weight 'bold) - (set-face-attribute 'org-level-6 nil :weight 'bold) - (set-face-attribute 'org-level-7 nil :weight 'bold) - (set-face-attribute 'org-level-8 nil :weight 'bold))) + ;; (with-eval-after-load "org" + ;; (let* ((base-height (face-attribute 'variable-pitch :height)) + ;; (base-font-color (face-foreground 'default nil 'default))) + ;; (set-face-attribute 'org-document-title nil :weight 'bold :height (+ 60 base-height)) + ;; (set-face-attribute 'org-level-1 nil :weight 'bold :height (+ 40 base-height)) + ;; (set-face-attribute 'org-level-2 nil :weight 'bold :height (+ 30 base-height)) + ;; (set-face-attribute 'org-level-3 nil :weight 'bold :height (+ 20 base-height)) + ;; (set-face-attribute 'org-level-4 nil :weight 'bold :height (+ 10 base-height)) + ;; (set-face-attribute 'org-level-5 nil :weight 'bold) + ;; (set-face-attribute 'org-level-6 nil :weight 'bold) + ;; (set-face-attribute 'org-level-7 nil :weight 'bold) + ;; (set-face-attribute 'org-level-8 nil :weight 'bold))) #+END_SRC ** Org Blog @@ -1256,8 +1267,11 @@ set default eshell history folder #+BEGIN_SRC emacs-lisp :tangle yes :results silent (require 'utilities) - (add-hook 'eshell-mode-hook (lambda () - (local-set-key (kbd "C-l") 'sd/eshell-clear-buffer))) + ;; (add-hook 'eshell-mode-hook (lambda () + ;; (local-set-key (kbd "C-l") 'sd/eshell-clear-buffer))) + (add-hook 'eshell-mode-hook (apply-partially #'local-set-key (kbd "C-l") 'sd/eshell-clear-buffer)) + ;; (add-hook 'eshell-mode-map (lambda () (interactive) + ;; (define-key eshell-mode-map (kbd "") 'completion-at-point))) #+END_SRC ** Toggle Eshell @@ -1482,10 +1496,10 @@ Type =o= to go to the link ** Which key [[https://github.com/justbur/emacs-which-key][which-key]] show the key bindings #+BEGIN_SRC emacs-lisp :tangle yes :results silent - (use-package which-key - :ensure t - :config - (which-key-mode)) + ;; (use-package which-key + ;; :ensure t + ;; :config + ;; (which-key-mode)) #+END_SRC ** View only for some directory @@ -2108,15 +2122,14 @@ bindings in =lispy-mode-map= after loaded. see [[http://stackoverflow.com/questi (use-package lispy :ensure t :init + (setq lispy-delete-backward-recenter 0) (with-eval-after-load "lispy" (define-key lispy-mode-map (kbd "M-o") nil) (define-key lispy-mode-map (kbd "g") 'special-lispy-goto-local) (define-key lispy-mode-map (kbd "G") 'special-lispy-goto) (define-key lispy-mode-map (kbd "M-m") 'back-to-indentation)) :config - (add-hook 'emacs-lisp-mode-hook (lambda () (lispy-mode 1)))) - - + (add-hook 'emacs-lisp-mode-hook (apply-partially #'lispy-mode 1))) #+END_SRC ** Perl @@ -2136,9 +2149,7 @@ bindings in =lispy-mode-map= after loaded. see [[http://stackoverflow.com/questi (setq cperl-tab-always-indent t) ;(setq cperl-brace-offset 0) - (add-hook 'cperl-mode-hook - '(lambda () - (cperl-set-style "C++"))) + (add-hook 'cperl-mode-hook (apply-partially #'cperl-set-style "C++")) (defalias 'perldoc 'cperl-perldoc) #+END_SRC @@ -2176,20 +2187,21 @@ Change the compile-command to set the default command run when call =compile= Mapping =s-r= (on Mac, it's =Command + R= to run the script. Here =current-prefix-arg= is set to call =compilation= interactively. #+BEGIN_SRC emacs-lisp :tangle yes :results silent - (defun my-perl-hook () - (progn - (setq-local compilation-read-command nil) - (set (make-local-variable 'compile-command) - (concat "/usr/bin/perl " - (if buffer-file-name - (shell-quote-argument buffer-file-name)))) - (local-set-key (kbd "s-r") - (lambda () - (interactive) - ; (setq current-prefix-arg '(4)) ; C-u - (call-interactively 'compile))))) + ;; this has be implemented in below compile part + ;; (defun my-perl-hook () + ;; (progn + ;; (setq-local compilation-read-command nil) + ;; (set (make-local-variable 'compile-command) + ;; (concat "/usr/bin/perl " + ;; (if buffer-file-name + ;; (shell-quote-argument buffer-file-name)))) + ;; (local-set-key (kbd "s-r") + ;; (lambda () + ;; (interactive) + ;; ; (setq current-prefix-arg '(4)) ; C-u + ;; (call-interactively 'compile))))) - (add-hook 'cperl-mode-hook 'my-perl-hook) + ;; (add-hook 'cperl-mode-hook 'my-perl-hook) #+END_SRC ** C & C++ @@ -2278,7 +2290,8 @@ irony-company (use-package company-c-headers :ensure t :config - (add-to-list 'company-c-headers-path-system "/usr/include/c++/4.2.1/")) + (add-to-list 'company-c-headers-path-system "/usr/include/c++/4.2.1/") + (add-to-list 'company-c-headers-path-system "/usr/local/include/")) ;; (with-eval-after-load 'company ;; (add-to-list 'company-backends 'company-irony) @@ -2329,27 +2342,30 @@ irony-company *** google C style #+BEGIN_SRC emacs-lisp :tangle yes :results silent - (use-package google-c-style - :ensure t - :config - (add-hook 'c-mode-hook 'google-set-c-style) - (add-hook 'c++-mode-hook 'google-set-c-style)) + ;; (use-package google-c-style + ;; :ensure t + ;; :config + ;; (add-hook 'c-mode-hook 'google-set-c-style) + ;; (add-hook 'c++-mode-hook 'google-set-c-style)) #+END_SRC *** Compile and Run the C file #+BEGIN_SRC emacs-lisp :tangle yes :results silent (defun my-cpp-hook () (let* ((current-file-name) - (a-dot-out-file)) + (out-file-name)) (when buffer-file-name (setq current-file-name (shell-quote-argument buffer-file-name)) - (setq a-dot-out-file (concat (file-name-directory buffer-file-name) "a.out"))) + (setq out-file-name (shell-quote-argument (concat (file-name-sans-extension buffer-file-name) ".out")))) (setq-local compilation-read-command t) (set (make-local-variable 'compile-command) (concat "g++ -Wall " current-file-name + " -o " + out-file-name " && " - a-dot-out-file)) + out-file-name + )) (local-set-key (kbd "s-r") 'compile))) (add-hook 'c-mode-hook 'my-cpp-hook) @@ -2407,7 +2423,9 @@ Set the environments vairables in compilation mode (setq compilation-environment (cons "LC_ALL=C" compilation-environment)) (setq compilation-auto-jump-to-first-error t) (setq compilation-auto-jump-to-next t) - (setq compilation-scroll-output 'first-error)) + (setq compilation-scroll-output 'first-error) + ;; this will save all the modified buffers before compile + (setq compilation-ask-about-save nil)) ;; super-r to compile (with-eval-after-load "compile" @@ -2416,6 +2434,37 @@ Set the environments vairables in compilation mode (define-key compilation-mode-map (kbd "p") 'compilation-previous-error) (define-key compilation-mode-map (kbd "r") #'recompile)) + + ;; (loop for (mode . program) in '( + ;; (lua-mode-hook . "lua") + ;; (perl-mode-hook . "perl") + ;; (python-mode-hook . "python") + ;; (shell-mode-hook . "sh")) + ;; do (add-hook mode `(lambda () + ;; (unless (or (file-exists-p "makefile") + ;; (file-exists-p "Makefile")) + ;; (set (make-local-variable 'compile-command) + ;; (concat ,program + ;; " " + ;; (if buffer-file-name + ;; (shell-quote-argument buffer-file-name)))))))) + + ;; here note dynamic binding the value of vv, otherwise it will resport error when run the hook. + ;; https://emacs.stackexchange.com/questions/10394/scope-in-lambda + (dolist (vv '( + (cperl-mode-hook . "perl") + (lua-mode-hook . "lua") + (python-mode-hook . "python") + (shell-mode-hook . "sh"))) + (add-hook (car vv) `(lambda () + (unless (or (file-exists-p "makefile") + (file-exists-p "Makefile")) + (set (make-local-variable 'compile-command) + (concat (cdr ',vv) + " " + (if buffer-file-name + (shell-quote-argument buffer-file-name)))))))) + (global-set-key (kbd "s-r") 'compile) #+END_SRC @@ -2673,8 +2722,9 @@ Then Run =M-x gnus= ;; (with-eval-after-load 'gnus-summary-mode ;; (define-key gnus-summary-mode-map (kbd "C-o") 'sd/hydra-window/body)) - (add-hook 'gnus-summary-mode-hook (lambda () - (define-key gnus-summary-mode-map (kbd "C-o") nil))) + ;; (add-hook 'gnus-summary-mode-hook (lambda () + ;; (define-key gnus-summary-mode-map (kbd "C-o") nil))) + ;(add-hook 'gnus-summary-mode-hook (apply-partially #'define-key gnus-summary-mode-map (kbd "C-o") nil)) #+END_SRC @@ -3520,6 +3570,11 @@ Refer [[https://github.com/fnwiya/dotfiles/blob/c9ca79f1b22c919d9f4c3a0f944ba828 (define-key perspeen-mode-map (kbd "s-t") 'perspeen-tab-create-tab) (define-key perspeen-mode-map (kbd "s-t") 'perspeen-tab-create-tab)) #+END_SRC +* Evil Mode +#+BEGIN_SRC emacs-lisp :tangle yes :results silent + (org-babel-load-file "~/.emacs.d/emacs-evil.org") +#+END_SRC + * Note ** Check if emacs is in terminal of graphic mode @@ -3534,3 +3589,9 @@ Use =display-graphic-p= instead of =window-system= blog with modify list draw one line top of the windows +* test +#+BEGIN_SRC emacs-lisp :tangle yes :results silent + ;; test local mode line + ;; (add-to-list 'load-path "~/.emacs.d/elisp") + ;; (require 'my-mode-line) +#+END_SRC