X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d_2%2Fconfig.org;h=b087ec4503123b34da49306148f96c18b5e2023f;hb=3d73c0c568a22600ee7ddb49a55a899a43efc14c;hp=8084ba7776273361ffc48820d7c84ec15dc07d8f;hpb=bbf01ae16dfeb70319c76f070f3a80ea5dfbfadc;p=dotfiles.git diff --git a/emacs.d_2/config.org b/emacs.d_2/config.org index 8084ba7..b087ec4 100644 --- a/emacs.d_2/config.org +++ b/emacs.d_2/config.org @@ -64,6 +64,15 @@ Disable scroll bar, tool-bar and menu-bar #+END_SRC +set custom file + +#+BEGIN_SRC emacs-lisp :tangle yes :results silent + + (setq custom-file "~/.emacs.d/custom.el") + (load custom-file) + +#+END_SRC + Switch the focus to help window when it appears #+BEGIN_SRC emacs-lisp :tangle yes :results silent @@ -268,6 +277,28 @@ improve color for org-mode #+END_SRC +** Rainbow-delimiter + +#+BEGIN_SRC emacs-lisp :tangle yes :results silent + + (use-package rainbow-delimiters + :ensure t + :init + (add-hook 'prog-mode-hook #'rainbow-delimiters-mode)) + +#+END_SRC + +** page-break-lines + +#+BEGIN_SRC emacs-lisp :tangle yes :results silent + + (use-package page-break-lines + :ensure t + :config + (turn-on-page-break-lines-mode)) + +#+END_SRC + * Org-mode Settings ** Org-mode Basic setting @@ -434,6 +465,32 @@ Install MacTex-basic and some tex packages (setq TeX-master t))) #+END_SRC + +** others + +refer to [[http://coldnew.github.io/coldnew-emacs/#orgheadline94][fancy todo states]] + +#+BEGIN_SRC emacs-lisp :tangle yes :results silent + + (setq org-todo-keywords '((sequence "☛ TODO(t)" "|" "✔ DONE(d)") + (sequence "⚑ WAITING(w)" "|") + (sequence "|" "✘ CANCELED(c)"))) + +#+END_SRC + +extend org-mode's easy templates, refer to [[http://coldnew.github.io/coldnew-emacs/#orgheadline94][Extend org-modes' esay templates]] + +#+BEGIN_SRC emacs-lisp :tangle yes :results silent + + (add-to-list 'org-structure-template-alist + '("E" "#+BEGIN_SRC emacs-lisp\n?\n#+END_SRC")) + (add-to-list 'org-structure-template-alist + '("S" "#+BEGIN_SRC sh\n?\n#+END_SRC")) + (add-to-list 'org-structure-template-alist + '("p" "#+BEGIN_SRC plantuml :file uml.png \n?\n#+END_SRC")) + +#+END_SRC + * Magit [[https://github.com/magit/magit][Magit]] is a very cool git interface on Emacs. @@ -567,6 +624,51 @@ Use =ESC= to exit minibuffer. Also I map =Super-h= the same as =C-g= #+END_SRC +** =Ctrl= key bindings + +#+BEGIN_SRC emacs-lisp :tangle yes :results silent + ;; + + ;; C-h help + ;; C-j newline and indent + ;; C-k kill line + ;; C-l recenter-top-bottom + ;; (global-set-key (kbd "C-;") 'ido-switch-buffer) + ;; C-; + ;; C-' + ;; C-ret + + ;; C-n next-line + ;; C-m + ;; C-, + ;; C-. + ;; C-/ + + ;; C-y + ;; C-u + ;; C-i + ;; C-o + ;; C-p + ;; C-[ + ;; C-] + ;; C-\ + + ;; C-= + ;; C-- + ;; C-0 + ;; C-9 + ;; C-8 + ;; C-7 + + ;; C-Space + + + + + + + +#+END_SRC ** =Super= bindings for file, buffer and windows @@ -576,24 +678,29 @@ Some global bindings on =Super=, on Mac, it is =Command= (global-set-key (kbd "s-h") 'keyboard-quit) (global-set-key (kbd "s-j") 'ido-switch-buffer) + (global-set-key (kbd "s-k") 'ido-find-file) ;; s-k --> kill-this-buffer - (global-set-key (kbd "s-k") (lambda () + (global-set-key (kbd "s-l") (lambda () (interactive) (if (> (length (window-list)) 1) (delete-window) (message "Only one Windows now!")))) ;; s-l --> goto-line + (global-set-key (kbd "s-;") 'swiper) ;; s-; --> ;; s-' --> 'next-multiframe-window (global-set-key (kbd "") 'toggle-frame-fullscreen) ;; (global-set-key (kbd "s-y") 'projectile-find-file) (global-set-key (kbd "s-f") 'projectile-find-file) - (global-set-key (kbd "s-[") 'next-buffer) - (global-set-key (kbd "s-]") 'previous-buffer) + (global-set-key (kbd "s-[") 'persp-next) + (global-set-key (kbd "s-]") 'persp-prev) (global-set-key (kbd "s-`") 'mode-line-other-buffer) + (global-set-key (kbd "s-n") 'persp-next) + (global-set-key (kbd "s-p") 'persp-prev) + ;; someothers default mapping on super (command) key @@ -663,20 +770,133 @@ I use the prefix =M-s= for searching in buffers (define-key keymap (car binding) (cdr binding))) (global-set-key key keymap)) - (global-set-key (kbd "M-s M-s") 'isearch-forward-regexp) - (global-set-key (kbd "M-s M-r") 'isearch-backward-regexp) + (define-key minibuffer-local-map "\M-s" nil) + (global-set-key (kbd "M-s s") 'isearch-forward-regexp) (define-key isearch-mode-map "\M-s" 'isearch-repeat-forward) + (global-set-key (kbd "M-s r") 'isearch-backward-regexp) (define-key isearch-mode-map "\M-r" 'isearch-repeat-backward) + (global-set-key (kbd "s-/") 'isearch-forward-regexp) + (define-key isearch-mode-map (kbd "s-/") 'isearch-repeat-forward) + (define-key isearch-mode-map (kbd "C-n") 'isearch-repeat-forward) + + + (set-face-background 'ido-first-match "white") + + ;; M-s o --> occur + ;; M-s s --> isearch-forward-regexp + ;; M-s r --> isearch-backward-regexp + ;; M-s w --> isearch-forward-word + ;; M-s . --> isearch-forward-symbol-at-point + ;; M-s _ --> isearch-forward-symbol + + ;; highlight bindings + ;; M-s h . --> highlight-symbol-at-point + ;; M-s h r --> highlight-regexp + ;; M-s h u --> unhighlight-regexp + ;; M-s h l --> highlight-lines-match-regexp + ;; M-s h p --> highlight-phrase + ;; M-s h f --> hi-lock-find-patterns + + ;; ;; (global-set-key (kbd "M-s M-r") 'isearch-backward-regexp) + ;; + ;; M-c + ;; M-r + ;; M-t + ;; M-u, #+END_SRC +Occur search key bindings +#+BEGIN_SRC emacs-lisp :tangle yes :results silent -* Misc Settings + (define-key occur-mode-map (kbd "C-n") + (lambda () + (interactive) + (occur-next) + (occur-mode-goto-occurrence-other-window) + (recenter) + (other-window 1))) + (define-key occur-mode-map (kbd "C-p") + (lambda () + (interactive) + (occur-prev) + (occur-mode-goto-occurrence-other-window) + (recenter) + (other-window 1))) + +#+END_SRC + + +** =M-o= as prefix key for windows + +** =M-g= as prefix key for launcher + +** others + +#+BEGIN_SRC emacs-lisp :tangle yes :results silent + + + ;; C-' undefined + ;; C-. undefined +#+END_SRC + +* Eshell + +Eshell alias + +#+BEGIN_SRC emacs-lisp :tangle yes :results silent + + (defalias 'e 'ido-find-file) + (defalias 'ff 'ido-find-file) + (defalias 'ee 'ido-find-file-other-window) + +#+END_SRC + +Quickly start eshll in split window below, refer [[http://www.howardism.org/Technical/Emacs/eshell-fun.html][eshell-here]] + +#+BEGIN_SRC emacs-lisp :tangle yes :results silent + + (defun eshell-x () + (insert "exit") + (eshell-send-input) + (delete-window)) + + (defun eshell-here () + "Opens up a new shell in the directory associated with the + current buffer's file. The eshell is renamed to match that + directory to make multiple eshell windows easier." + (interactive) + (let* ((parent (if (buffer-file-name) + (file-name-directory (buffer-file-name)) + default-directory)) + (height (/ (window-total-height) 3)) + (name (car (last (split-string parent "/" t)))) + (eshell-name (concat "*eshell: " name "*"))) + (split-window-vertically (- height)) + (other-window 1) + (if (get-buffer eshell-name) + (progn + (message "buffer exist") + (switch-to-buffer eshell-name)) + (progn + (eshell "new") + (rename-buffer eshell-name) + + (insert (concat "ls")) + (eshell-send-input))))) + + ;; (global-set-key (kbd "M-`") (lambda () + ;; (interactive) + ;; (if (buffer-name)))) + +#+END_SRC + +* Misc Settings ** [[https://github.com/abo-abo/hydra][Hydra]] @@ -764,9 +984,7 @@ Refer [[https://github.com/abo-abo/hydra/blob/master/hydra-examples.el][hydra-ex (split-window-below) (windmove-down)) "horz") - ;; ("o" delete-other-windows "one" :exit t) - ;; Todo define o to triggle delete others windows and restore windows layout - ("o" triggle-windows-max-size "maximize" :exit t) + ("o" delete-other-windows "one" :exit t) ("a" ace-window "ace") ("s" ace-swap-window "swap") ("d" ace-delete-window "ace-one" :exit t) @@ -924,7 +1142,7 @@ Type =o= to go to the link (persp-mode) :bind (:map projectile-mode-map - ("s-p" . projectile-persp-switch-project))) + ("s-t" . projectile-persp-switch-project))) ;; projectile-find-file ;; projectile-switch-buffer @@ -987,6 +1205,65 @@ Play Go in Emacs, gnugo xpm refert [[https://github.com/okanotor/dotemacs/blob/f #+END_SRC +** undo-tree + +#+BEGIN_SRC emacs-lisp :tangle yes :results silent + + (use-package undo-tree + :ensure t + :config + (global-undo-tree-mode 1)) + +#+END_SRC + +** swiper + +#+BEGIN_SRC emacs-lisp :tangle yes :results silent + + (use-package swiper + :ensure t) + + + (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) + +#+END_SRC + +** Tabbar + +#+BEGIN_SRC emacs-lisp :tangle yes :results silent + + ;; (use-package tabbar-ruler + ;; :ensure t + ;; :init + ;; (setq tabbar-ruler-global-tabbar t) + ;; (setq tabbar-ruler-global-ruler t) + ;; (setq tabbar-ruler-popu-menu t) + ;; (setq tabbar-ruler-popu-toolbar t) + ;; (setq tabbar-use-images t) + ;; :config + ;; (tabbar-ruler-group-by-projectile-project) + ;; (global-set-key (kbd "s-1") 'tabbar-forward-group) + ;; (global-set-key (kbd "s-2") 'tabbar-ruler-forward)) + +#+END_SRC + * Programming ** Languages @@ -1189,6 +1466,17 @@ company mode #+END_SRC +[[https://github.com/company-mode/company-statistics][company-statistics]] + +#+BEGIN_SRC emacs-lisp :tangle yes :results silent + + (use-package company-statistics + :ensure t + :config + (company-statistics-mode)) + +#+END_SRC + * Todo - change M-o to trigger to delete other windows and restore previous config