From 828141a96c513fb7f463314291f364027b6a58ea Mon Sep 17 00:00:00 2001 From: Marc Pohling Date: Mon, 2 Apr 2018 18:26:23 +0200 Subject: [PATCH] added git-gutter, git timemachine --- config.org | 44 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 40 insertions(+), 4 deletions(-) diff --git a/config.org b/config.org index 14ca868..857a045 100644 --- a/config.org +++ b/config.org @@ -16,11 +16,9 @@ * Stuff to add / to fix - smartparens - The last time I tried it it was weird and blocked me occasionally (like I couldn't remove brackets) + a sane default configuration for navigation, manipulation etc. is still necessary - Spaceline / Powerline or similar I want a pretty status bar! - - Company - It's too active and autocompletes normal text (don't!). Also it completes on RET, which is annoying when I finish a sentence with RET and company "completes" it to a longer word - Markdown mode There might be more than one package for this. @@ -608,7 +606,26 @@ Colorize colors as text with their value ) #+end_src -** Magit +Highlight parens etc. for improved readability +#+begin_src emacs-lisp +(use-package rainbow-delimiters + :ensure t + :config + (add-hook 'prog-mode-hook 'rainbow-delimiters-mode) +) +#+end_src + +** Smartparens + Smartparens is a beast on its own, so it's worth having a dedicated section for it + #+begin_src emacs-lisp +(use-package smartparens + :ensure t + :diminish smartparens-mode + :config + (add-hook 'prog-mode-hook 'smartparens-mode) +) + #+end_src +** Git [[https://magit.vc/manual/magit/index.html][Link]] I want to do git stuff here, not in a separate terminal window @@ -639,6 +656,25 @@ Colorize colors as text with their value ) #+end_src + Display line changes in gutter based on git history. Enable it everywhere + [[https://github.com/syohex/emacs-git-gutter][Source]] + #+begin_src emacs-lisp +(use-package git-gutter + :ensure t + :config + (global-git-gutter-mode t) + :diminish git-gutter-mode +) + #+end_src + + Time machine lets me step through the history of a file as recorded in git. + [[https://github.com/pidu/git-timemachine][Source]] + #+begin_src emacs-lisp +(use-package git-timemachine + :ensure t +) + #+end_src + ** Company Mode Complete Anything!