X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Fconfig.org;h=90b3ad1a80b6e14521ab6695e1a6df56f15c10db;hb=225141d6f7444d2bc6cbff3b3998d463e6ecacb9;hp=041cf0685238dcab414a022b9d8822ba0ded3a3b;hpb=899755001c88619152b2794e6d1383d8a831ba87;p=dotfiles.git diff --git a/emacs.d/config.org b/emacs.d/config.org index 041cf06..90b3ad1 100644 --- a/emacs.d/config.org +++ b/emacs.d/config.org @@ -520,7 +520,7 @@ use [[https://github.com/sabof/org-bullets][org-bullets]] package to show utf-8 (lambda () (org-bullets-mode t)))) - (setq org-bullets-bullet-list '("⦿" "✪" "⚫" "◉" "○" "►" "◆")) + (setq org-bullets-bullet-list '("⦿" "✪" "◉" "○" "►" "◆")) #+END_SRC ** Worf Mode @@ -642,6 +642,7 @@ Logging Stuff (setq org-clock-into-drawer t) ;; save state change notes and time stamp into LOGBOOK drawer (setq org-log-into-drawer t) + (setq org-clock-into-drawer "CLOCK") #+END_SRC *** Tags @@ -720,7 +721,6 @@ Setting agenda files and the agenda view (setq org-agenda-show-all-dates t) #+END_SRC - ** Export PDF Install MacTex-basic and some tex packages @@ -827,12 +827,23 @@ extend org-mode's easy templates, refer to [[http://coldnew.github.io/coldnew-em [[https://github.com/magit/magit][Magit]] is a very cool git interface on Emacs. -#+BEGIN_SRC emacs-lisp :tangle yes :results silent +and Defined keys, using vi keybindings, Refer abo-abo's setting [[https://github.com/abo-abo/oremacs/blob/c5cafdcebc88afe9e73cc8bd40c49b70675509c7/modes/ora-nextmagit.el][here]] +#+BEGIN_SRC emacs-lisp :tangle yes :results silent (use-package magit :ensure t - :commands magit-status magit-blame) - + :commands magit-status magit-blame + :config + (dolist (map (list magit-status-mode-map + magit-log-mode-map + magit-diff-mode-map + magit-staged-section-map)) + (define-key map "j" 'magit-section-forward) + (define-key map "k" 'magit-section-backward) + (define-key map "n" nil) + (define-key map "p" nil) + (define-key map "v" 'recenter-top-bottom) + (define-key map "i" 'magit-section-toggle))) #+END_SRC * IDO & SMEX @@ -1024,8 +1035,8 @@ Some global bindings on =Super=, on Mac, it is =Command= ;; (global-set-key (kbd "s-y") 'projectile-find-file) (global-set-key (kbd "s-f") 'projectile-find-file) - (global-set-key (kbd "s-[") 'persp-next) - (global-set-key (kbd "s-]") 'persp-prev) + ;; (global-set-key (kbd "s-[") 'persp-next) + ;; (global-set-key (kbd "s-]") 'persp-prev) (global-set-key (kbd "s-`") 'mode-line-other-buffer) @@ -1191,7 +1202,6 @@ Eshell alias 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) @@ -1221,32 +1231,63 @@ Quickly start eshll in split window below, refer [[http://www.howardism.org/Tech (insert (concat "ls")) (eshell-send-input))))) - ;; (global-set-key (kbd "M-`") (lambda () - ;; (interactive) - ;; (if (buffer-name)))) + (global-unset-key (kbd "M-`")) + (global-set-key (kbd "M-`") #'eshell-here) +#+END_SRC +#+BEGIN_SRC emacs-lisp :tangle yes :results silent + (defun sd/window-has-eshell () + "Check if current windows list has a eshell buffer, and return the window" + (interactive) + (let ((ret nil)) + (dolist (window (window-list)) + (let ((modename (with-current-buffer (window-buffer window) + major-mode))) + (if (equal modename 'eshell-mode) + (setq ret window)))) + ret)) + + (defun sd/toggle-eshell-here () + "Toggle a eshell buffer vertically" + (interactive) + (if (sd/window-has-eshell) + (if (equal major-mode 'eshell-mode) + (delete-window) + (select-window (sd/window-has-eshell))) + (progn + (split-window-vertically (- (/ (window-total-height) 3))) + (other-window 1) + (unless (and (boundp 'eshell-buffer-name) (get-buffer eshell-buffer-name)) + (eshell)) + (switch-to-buffer eshell-buffer-name) + (goto-char (point-max)) + (eshell-kill-input) + (insert (format "cd %s" default-directory)) + (eshell-send-input)))) + + (global-unset-key (kbd "M-`")) + (global-set-key (kbd "M-`") 'sd/toggle-eshell-here) #+END_SRC * Misc Settings ** [[https://github.com/abo-abo/hydra][Hydra]] - +*** hydra install #+BEGIN_SRC emacs-lisp :tangle yes :results silent - (use-package hydra :ensure t) - + ;; disable new line in minibuffer when hint hydra + (setq hydra-lv nil) #+END_SRC *** Font Zoom #+BEGIN_SRC emacs-lisp :tangle yes :results silent + (defhydra sd/font-zoom (global-map "") - (defhydra sd/font-zoom (global-map "") "zoom" ("g" text-scale-increase "in") ("l" text-scale-decrease "out")) - #+END_SRC *** Windmove Splitter @@ -1292,15 +1333,14 @@ Refer [[https://github.com/abo-abo/hydra/blob/master/hydra-examples.el][hydra-ex *** hydra-window #+BEGIN_SRC emacs-lisp :tangle yes :results silent - (winner-mode 1) (defhydra sd/hydra-window (:color red :columns nil) "window" - ("h" windmove-left nil) - ("j" windmove-down nil) - ("k" windmove-up nil) - ("l" windmove-right nil) + ("h" windmove-left nil :exit t) + ("j" windmove-down nil :exit t) + ("k" windmove-up nil :exit t) + ("l" windmove-right nil :exit t) ("H" hydra-move-splitter-left nil) ("J" hydra-move-splitter-down nil) ("K" hydra-move-splitter-up nil) @@ -1309,26 +1349,26 @@ Refer [[https://github.com/abo-abo/hydra/blob/master/hydra-examples.el][hydra-ex (interactive) (split-window-right) (windmove-right)) - "vert") + "vert" :exit t) ("x" (lambda () (interactive) (split-window-below) (windmove-down)) - "horz") + "horz" :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) ("i" ace-maximize-window "ace-one" :exit t) ("b" ido-switch-buffer "buf") - ("m" headlong-bookmark-jump "bmk") + ;; ("m" headlong-bookmark-jump "bmk") ("q" nil "cancel") ("u" (progn (winner-undo) (setq this-command 'winner-undo)) "undo") ("r" (progn (winner-redo) (setq this-command 'winner-redo)) "redo") ("f" nil)) - (global-unset-key (kbd "M-o")) - (global-set-key (kbd "M-o") 'sd/hydra-window/body) + (global-unset-key (kbd "C-o")) + (global-set-key (kbd "C-o") 'sd/hydra-window/body) (defun triggle-windows-max-size () (interactive) @@ -1498,11 +1538,10 @@ Type =o= to go to the link We can use [[https://www.gnu.org/software/emms/quickstart.html][Emms]] for multimedia in Emacs #+BEGIN_SRC emacs-lisp :tangle yes :results silent - (use-package emms :ensure t :init - (setq emms-source-file-default-directory "~/Music/emms/") + (setq emms-source-file-default-directory "~/Music/") :config (emms-standard) (emms-default-players)