X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Fconfig.org;h=0ab4667c67c98385536749c93f1b433acc9af5bb;hb=ddae35fd7e6a69d80c05d073b36f9e6dc892b0bb;hp=b087ec4503123b34da49306148f96c18b5e2023f;hpb=7341be87b13354b5c55bb74ced02a53c2620d919;p=dotfiles.git diff --git a/emacs.d/config.org b/emacs.d/config.org index b087ec4..0ab4667 100644 --- a/emacs.d/config.org +++ b/emacs.d/config.org @@ -69,7 +69,8 @@ set custom file #+BEGIN_SRC emacs-lisp :tangle yes :results silent (setq custom-file "~/.emacs.d/custom.el") - (load custom-file) + (if (file-exists-p custom-file) + (load custom-file)) #+END_SRC @@ -164,7 +165,7 @@ Setting the fonts (if window-system (when sd/fixed-font-family (set-frame-font sd/fixed-font-family) - (set-face-attribute 'default nil :font sd/fixed-font-family :height 120) + (set-face-attribute 'default nil :font sd/fixed-font-family :height 140) (set-face-font 'default sd/fixed-font-family))) #+END_SRC @@ -299,6 +300,148 @@ improve color for org-mode #+END_SRC +** rainbow-mode + +Enable rainbow mode in emacs lisp mode + +#+BEGIN_SRC emacs-lisp :tangle yes :results silent + (use-package rainbow-mode + :ensure t + ; :init + ; (add-hook emacs-lisp-mode-hook 'rainbow-mode) + ) + +#+END_SRC + +** Mode-line + +clean mode line, Refer to [[https://www.masteringemacs.org/article/hiding-replacing-modeline-strings][Marstering Emacs]] + +#+BEGIN_SRC emacs-lisp :tangle yes :results silent + (defvar mode-line-cleaner-alist + `((auto-complete-mode . " α") + (yas/minor-mode . " υ") + (paredit-mode . " π") + (eldoc-mode . "") + (abbrev-mode . "") + (projectile-mode . "") + (ivy-mode . "") + (undo-tree-mode . "") + ;; default is WK + (which-key-mode . "") + ;; default is SP + (smartparens-mode . "") + ;; default is LR + (linum-relative-mode . "") + ;; default is ARev + (auto-revert-mode . "") + ;; default is Ind + (org-indent-mode . "") + ;; Major modes + (lisp-interaction-mode . "λ") + (hi-lock-mode . "") + (python-mode . "Py") + (emacs-lisp-mode . "EL") + (nxhtml-mode . "nx")) + "Alist for `clean-mode-line'. + + When you add a new element to the alist, keep in mind that you + must pass the correct minor/major mode symbol and a string you + want to use in the modeline *in lieu of* the original.") + + + (defun clean-mode-line () + (interactive) + (loop for cleaner in mode-line-cleaner-alist + do (let* ((mode (car cleaner)) + (mode-str (cdr cleaner)) + (old-mode-str (cdr (assq mode minor-mode-alist)))) + (when old-mode-str + (setcar old-mode-str mode-str)) + ;; major mode + (when (eq mode major-mode) + (setq mode-name mode-str))))) + + + (add-hook 'after-change-major-mode-hook 'clean-mode-line) +#+END_SRC + +#+BEGIN_SRC emacs-lisp :tangle yes :results silent + (use-package powerline + :ensure t + :config + ;; (powerline-center-theme) + ) + + ;; (use-package smart-mode-line + ;; :ensure t) + ;; (use-package smart-mode-line-powerline-theme + ;; :ensure t) + + (defun sd/powerline-simpler-vc (s) + (if s + (replace-regexp-in-string "Git[:-]" "" s) + s)) + + (defun sd/powerline-center-theme_revised () + "Setup a mode-line with major and minor modes centered." + (interactive) + (setq-default mode-line-format + '("%e" + (:eval + (let* ((active (powerline-selected-window-active)) + (mode-line-buffer-id (if active 'mode-line-buffer-id 'mode-line-buffer-id-inactive)) + (mode-line (if active 'mode-line 'mode-line-inactive)) + (face1 (if active 'powerline-active1 'powerline-inactive1)) + (face2 (if active 'powerline-active2 'powerline-inactive2)) + (separator-left (intern (format "powerline-%s-%s" + (powerline-current-separator) + (car powerline-default-separator-dir)))) + (separator-right (intern (format "powerline-%s-%s" + (powerline-current-separator) + (cdr powerline-default-separator-dir)))) + (lhs (list (powerline-raw "%*" mode-line 'l) + ;; (powerline-buffer-size mode-line 'l) + (powerline-buffer-id mode-line-buffer-id 'l) + (powerline-raw " ") + (funcall separator-left mode-line face1) + (powerline-narrow face1 'l) + ;; (powerline-vc face1) + (sd/powerline-simpler-vc (powerline-vc face1)) + )) + (rhs (list (powerline-raw global-mode-string face1 'r) + (powerline-raw "%4l" face1 'r) + (powerline-raw ":" face1) + (powerline-raw "%3c" face1 'r) + (funcall separator-right face1 mode-line) + (powerline-raw " ") + (powerline-raw "%6p" mode-line 'r) + (powerline-hud face2 face1))) + (center (list (powerline-raw " " face1) + (funcall separator-left face1 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) + (powerline-process face2) + (powerline-raw " :" face2) + (powerline-minor-modes face2 'l) + (powerline-raw " " face2) + (funcall separator-right face2 face1)))) + (concat (powerline-render lhs) + (powerline-fill-center face1 (/ (powerline-width center) 2.0)) + (powerline-render center) + (powerline-fill face1 (powerline-width rhs)) + (powerline-render rhs))))))) + + (sd/powerline-center-theme_revised) +#+END_SRC + +Fix the issue in mode line when showing triangle + +#+BEGIN_SRC emacs-lisp :tangle yes :results silent + (setq ns-use-srgb-colorspace nil) +#+END_SRC + * Org-mode Settings ** Org-mode Basic setting @@ -1226,22 +1369,22 @@ Play Go in Emacs, gnugo xpm refert [[https://github.com/okanotor/dotemacs/blob/f (ivy-mode 1) (setq ivy-use-virtual-buffers t) - (global-set-key "\C-s" 'swiper) - (global-set-key (kbd "C-c C-r") 'ivy-resume) - (global-set-key (kbd "") 'ivy-resume) - ;; (global-set-key (kbd "M-x") 'counsel-M-x) - ;; (global-set-key (kbd "C-x C-f") 'counsel-find-file) - (global-set-key (kbd " f") 'counsel-describe-function) - (global-set-key (kbd " v") 'counsel-describe-variable) - (global-set-key (kbd " l") 'counsel-load-library) - (global-set-key (kbd " i") 'counsel-info-lookup-symbol) - (global-set-key (kbd " u") 'counsel-unicode-char) - (global-set-key (kbd "C-c g") 'counsel-git) - (global-set-key (kbd "C-c j") 'counsel-git-grep) - (global-set-key (kbd "C-c k") 'counsel-ag) - (global-set-key (kbd "C-x l") 'counsel-locate) - (global-set-key (kbd "C-S-o") 'counsel-rhythmbox) - ;; (define-key read-expression-map (kbd "C-r") 'counsel-expression-history) + ;; (global-set-key "\C-s" 'swiper) + ;; (global-set-key (kbd "C-c C-r") 'ivy-resume) + ;; (global-set-key (kbd "") 'ivy-resume) + ;; ;; (global-set-key (kbd "M-x") 'counsel-M-x) + ;; ;; (global-set-key (kbd "C-x C-f") 'counsel-find-file) + ;; (global-set-key (kbd " f") 'counsel-describe-function) + ;; (global-set-key (kbd " v") 'counsel-describe-variable) + ;; (global-set-key (kbd " l") 'counsel-load-library) + ;; (global-set-key (kbd " i") 'counsel-info-lookup-symbol) + ;; (global-set-key (kbd " u") 'counsel-unicode-char) + ;; (global-set-key (kbd "C-c g") 'counsel-git) + ;; (global-set-key (kbd "C-c j") 'counsel-git-grep) + ;; (global-set-key (kbd "C-c k") 'counsel-ag) + ;; (global-set-key (kbd "C-x l") 'counsel-locate) + ;; (global-set-key (kbd "C-S-o") 'counsel-rhythmbox) + ;; ;; (define-key read-expression-map (kbd "C-r") 'counsel-expression-history) #+END_SRC