Move some packages to the Org config

This commit is contained in:
Gergely Polonkai 2018-07-29 20:48:11 +02:00
parent 8f4232063a
commit 329a86937d
2 changed files with 73 additions and 50 deletions

View File

@ -752,6 +752,79 @@ Unfortunately, this works only in a graphical mode.
:defer t) :defer t)
#+END_SRC #+END_SRC
** GNU Globals
#+BEGIN_SRC emacs-lisp
(use-package ggtags
:config
(add-hook 'c-mode-hook
(lambda ()
(ggtags-mode t)))
(add-hook 'c-mode-common-hook
(lambda ()
(when (derived-mode-p 'c-mode 'c++-mode 'java-mode)
(ggtags-mode t)))))
#+END_SRC
** Multiple cursors
Because one is never enough.
#+BEGIN_SRC emacs-lisp
(use-package multiple-cursors
:init
(defvar gpolonkai/mc-prefix-map (make-sparse-keymap)
"Prefix keymap for multiple-cursors")
(define-prefix-command 'gpolonkai/mc-prefix-map)
(define-key global-map (kbd "C-c m") 'gpolonkai/mc-prefix-map)
:config
(add-hook 'multiple-cursors-mode-enabled-hook
(lambda ()
(setq blink-matching-paren nil)))
(add-hook 'multiple-cursors-mode-disabled-hook
(lambda ()
(setq blink-matching-paren t)))
:bind (:map gpolonkai/mc-prefix-map
("t" . mc/mark-all-like-this)
("m" . mc/mark-all-like-this-dwim)
("l" . mc/edit-lines)
("e" . mc/edit-ends-of-lines)
("a" . mc/edit-beginnings-of-lines)
("n" . mc/mark-next-like-this)
("p" . mc/mark-previous-like-this)
("s" . mc/mark-sgml-tag-pair)
("d" . mc/mark-all-like-this-in-defun)))
#+END_SRC
*** Some extras
#+BEGIN_SRC emacs-lisp
(use-package mc-extras
:demand
:bind
(:map mc/keymap
("C-c m =" . mc/compare-chars)))
#+END_SRC
** Magit
#+BEGIN_SRC emacs-lisp
(use-package magit
:init
(setq magit-auto-revert-mode nil
magit-last-seen-setup-instructions "1.4.0"
magit-push-always-verify nil)
:bind
(:map ctl-x-map
("g" . magit-status)))
#+END_SRC
I also want FlySpell to be enabled during Git commit message editing.
#+BEGIN_SRC emacs-lisp
(add-hook 'git-commit-mode-hook 'turn-on-flyspell)
#+END_SRC
* Helm & Co. * Helm & Co.
** Helm ** Helm

50
init.el
View File

@ -37,16 +37,6 @@
(regexp-quote "/com.termux/") (regexp-quote "/com.termux/")
(expand-file-name "~"))) (expand-file-name "~")))
(use-package ggtags
:config
(add-hook 'c-mode-hook
(lambda ()
(ggtags-mode t)))
(add-hook 'c-mode-common-hook
(lambda ()
(when (derived-mode-p 'c-mode 'c++-mode 'java-mode)
(ggtags-mode t)))))
;; Whitespace mode ;; Whitespace mode
;; ;;
;; It is turned on by default, and can be toggled with F10 ;; It is turned on by default, and can be toggled with F10
@ -64,31 +54,6 @@
:map gpolonkai/pers-map :map gpolonkai/pers-map
("w" . whitespace-cleanup))) ("w" . whitespace-cleanup)))
;; Multiple cursors
(use-package multiple-cursors
:init
(defvar gpolonkai/mc-prefix-map (make-sparse-keymap)
"Prefix keymap for multiple-cursors")
(define-prefix-command 'gpolonkai/mc-prefix-map)
(define-key global-map (kbd "C-c m") 'gpolonkai/mc-prefix-map)
:config
(add-hook 'multiple-cursors-mode-enabled-hook
(lambda ()
(setq blink-matching-paren nil)))
(add-hook 'multiple-cursors-mode-disabled-hook
(lambda ()
(setq blink-matching-paren t)))
:bind (:map gpolonkai/mc-prefix-map
("t" . mc/mark-all-like-this)
("m" . mc/mark-all-like-this-dwim)
("l" . mc/edit-lines)
("e" . mc/edit-ends-of-lines)
("a" . mc/edit-beginnings-of-lines)
("n" . mc/mark-next-like-this)
("p" . mc/mark-previous-like-this)
("s" . mc/mark-sgml-tag-pair)
("d" . mc/mark-all-like-this-in-defun)))
(use-package eshell (use-package eshell
:config :config
(add-hook 'eshell-mode-hook (add-hook 'eshell-mode-hook
@ -118,15 +83,6 @@
("zi" . gpolonkai/zone-enable) ("zi" . gpolonkai/zone-enable)
("zq" . zone-leave-me-alone))) ("zq" . zone-leave-me-alone)))
;; Magit and friends
(use-package magit
:init
(setq magit-auto-revert-mode nil)
(setq magit-last-seen-setup-instructions "1.4.0")
:bind
(:map ctl-x-map
("g" . magit-status)))
(use-package origami (use-package origami
:demand :demand
:config :config
@ -434,12 +390,6 @@
(use-package identica-mode) (use-package identica-mode)
(use-package mc-extras
:demand
:bind
(:map mc/keymap
("C-c m =" . mc/compare-chars)))
(use-package org-projectile) (use-package org-projectile)
(use-package smart-mode-line-powerline-theme (use-package smart-mode-line-powerline-theme