X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Fconfig.org;h=28a33c15f0e659f68746156af50f5c2d108aa143;hb=be4017091a741b544d0a7761429fdd9f6635b128;hp=64e1957e31e8cc590370b8cd7091ba799a7a934c;hpb=bfb452b3ea5eb47521f958b07f306659fb3d022c;p=dotfiles.git diff --git a/emacs.d/config.org b/emacs.d/config.org index 64e1957..28a33c1 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 @@ -147,6 +152,12 @@ Check out [[http://tapoueh.org/emacs/el-get.html][el-get]]. (add-hook 'prog-mode-hook 'hl-line-mode) (add-hook 'text-mode-hook 'hl-line-mode) (add-hook 'dired-mode-hook 'hl-line-mode) + + ;; only highlight selected window + (setq hl-line-sticky-flag nil) + + (setq-default fill-column 120) + (add-hook 'text-mode-hook 'turn-on-auto-fill) #+END_SRC ** Smart Comments @@ -349,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 @@ -416,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 . "") @@ -539,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) @@ -589,7 +608,23 @@ set height in mode line :config (ido-mode 1) (ido-everywhere 1) - (add-to-list 'completion-ignored-extensions ".pyc")) + (add-to-list 'completion-ignored-extensions ".pyc") + + + (define-key ido-buffer-completion-map (kbd "C-w") #'ido-delete-backward-word-updir) + (define-key ido-file-completion-map (kbd "C-w") #'ido-delete-backward-word-updir) + (define-key ido-file-dir-completion-map (kbd "C-w") #'ido-delete-backward-updir) + ;; (define-key ido-file-dir-completion-map (kbd "C-i") #'ido-copy-current-word) + + ;; (dolist (map (list + ;; ido-buffer-completion-map + ;; ido-file-completion-map + ;; ido-file-dir-completion-map + ;; ido-common-completion-map)) + ;; (define-key map (kbd "C-w") #'ido-delete-backward-word-updir) + ;; ;; (define-key map (kbd "C-i") #'ido-copy-current-file-name) + ;; ) + ) (icomplete-mode t) #+END_SRC @@ -783,9 +818,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 '("⦿" "✪" "◉" "○" "►" "◆")) @@ -1144,7 +1177,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" @@ -1152,6 +1185,7 @@ extend org-mode's easy templates, refer to [[http://coldnew.github.io/coldnew-em (set-face-attribute face nil :inherit 'fixed-pitch)) (list 'org-code 'org-block 'org-block-background 'org-block-begin-line 'org-block-end-line)) (set-face-attribute 'org-table nil :family "Ubuntu Mono" :height 140) + (set-face-attribute 'org-formula nil :family "Ubuntu Mono" :height 140) ;; org-special-keyword inherited from font-lock-keywork originally; as org is changed to variable-pitch, it cause ;; the font in special-keywords are not monospace (set-face-attribute 'org-special-keyword nil :inherit '(font-lock-keyword-face fixed-pitch)) @@ -1172,18 +1206,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 @@ -1249,8 +1283,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 @@ -1475,10 +1512,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 @@ -2101,15 +2138,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 @@ -2129,9 +2165,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 @@ -2164,27 +2198,6 @@ Refer [[https://www.emacswiki.org/emacs/AutoInsertMode][AutoInsertMode]] Wiki #+END_SRC -*** Run Perl -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))))) - - (add-hook 'cperl-mode-hook 'my-perl-hook) -#+END_SRC - ** C & C++ C/C++ ide tools 1. completion (file name, function name, variable name) @@ -2220,10 +2233,10 @@ then install irony searver, and =LIBCLANG_LIBRARY= and =LIBCLANG_INCLUDE_DIR= ac #+END_SRC #+BEGIN_SRC sh - cmake -DLIBCLANG_LIBRARY\=/usr/local/Cellar/llvm/3.6.2/lib/libclang.dylib \ - -DLIBCLANG_INCLUDE_DIR=/usr/local/Cellar/llvm/3.6.2/include \ - -DCMAKE_INSTALL_PREFIX\=/Users/peli3/.emacs.d/irony/ \ - /Users/peli3/.emacs.d/elpa/irony-20160713.1245/server && cmake --build . --use-stderr --config Release --target install + cmake -DLIBCLANG_LIBRARY\=/usr/local/Cellar/llvm/4.0.1/lib/libclang.dylib \ + -DLIBCLANG_INCLUDE_DIR=/usr/local/Cellar/llvm/4.0.1/include \ + -DCMAKE_INSTALL_PREFIX\=/Users/peng/.emacs.d/irony/ \ + /Users/peng/.emacs.d/elpa/irony-20160713.1245/server && cmake --build . --use-stderr --config Release --target install #+END_SRC **** irony config @@ -2271,7 +2284,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) @@ -2322,11 +2336,34 @@ 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) + (out-file-name)) + (when buffer-file-name + (setq current-file-name (shell-quote-argument buffer-file-name)) + (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 + " && " + out-file-name + )) + (local-set-key (kbd "s-r") 'compile))) + + (add-hook 'c-mode-hook 'my-cpp-hook) + (add-hook 'c++-mode-hook 'my-cpp-hook) #+END_SRC ** Lua @@ -2380,7 +2417,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" @@ -2389,6 +2428,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 @@ -2646,8 +2716,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 @@ -2908,15 +2979,6 @@ Use =ESC= to exit minibuffer. Also I map =Super-h= the same as =C-g= (add-to-list 'projectile-globally-ignored-files "GTAGS") (projectile-global-mode t)) - ;; (use-package persp-projectile - ;; :ensure t - ;; :config - ;; (persp-mode) - ;; :bind - ;; ;; (:map projectile-mode-map - ;; ;; ("s-t" . projectile-persp-switch-project)) - ;; ) - ;; change default-directory of scratch buffer to projectile-project-root (defun sd/project-switch-action () "Change default-directory of scratch buffer to current projectile-project-root directory" @@ -3502,6 +3564,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 @@ -3516,3 +3583,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