Reformatted init.el

This commit is contained in:
tastytea 2019-04-12 03:03:37 +02:00
parent 454802acd1
commit 8c4bee69d8

49
init.el
View File

@ -1,5 +1,5 @@
;;; init.el --- tastytea's Emacs init file. ;;; init.el --- tastytea's Emacs init file.
;; Time-stamp: <2019-04-11T23:15:18+00:00> ;; Time-stamp: <2019-04-12T01:03:30+00:00>
;;; Commentary: ;;; Commentary:
;; I am using this file with Emacs 26, but most of it will probably work with ;; I am using this file with Emacs 26, but most of it will probably work with
@ -300,10 +300,9 @@ With argument, do this that many times."
(use-package highlight-doxygen (use-package highlight-doxygen
:custom-face :custom-face
(highlight-doxygen-comment (highlight-doxygen-comment ((t (:inherit font-lock-comment-face
((t (:inherit font-lock-comment-face :foreground "#667788")))) :foreground "#667788"))))
(highlight-doxygen-code-block (highlight-doxygen-code-block ((t (:inherit highlight-doxygen-comment-face))))
((t (:inherit highlight-doxygen-comment-face))))
:hook :hook
(prog-mode . highlight-doxygen-mode)) (prog-mode . highlight-doxygen-mode))
@ -400,7 +399,8 @@ With argument, do this that many times."
:custom :custom
(doom-neotree-file-icons 'icons) (doom-neotree-file-icons 'icons)
:custom-face :custom-face
(font-lock-comment-face ((t (:inherit font-lock-comment-face :foreground "#667755")))) (font-lock-comment-face ((t (:inherit font-lock-comment-face
:foreground "#667755"))))
:config :config
(load-theme 'doom-molokai t) (load-theme 'doom-molokai t)
(doom-themes-neotree-config))) (doom-themes-neotree-config)))
@ -433,7 +433,7 @@ With argument, do this that many times."
:defer t :defer t
:custom-face :custom-face
(Man-overstrike ((t (:inherit font-lock-type-face :bold t)))) (Man-overstrike ((t (:inherit font-lock-type-face :bold t))))
(Man-underline ((t (:inherit font-lock-keyword-face :underline t))))) (Man-underline ((t (:inherit font-lock-keyword-face :underline t)))))
;;;;;;;;;;;;;;;;;;;; Misc ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;; Misc ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Show directory tree in a window. ;; Show directory tree in a window.
@ -449,11 +449,9 @@ With argument, do this that many times."
("<f8>" . neotree-toggle)) ("<f8>" . neotree-toggle))
;; Git integration. ;; Git integration.
(use-package git-commit (use-package git-commit)
:pin melpa-stable)
(unless slow-computer (unless slow-computer
(use-package magit (use-package magit
:pin melpa-stable
:config :config
(defun my/magit-kill-buffers (arg) (defun my/magit-kill-buffers (arg)
"Restore window configuration and kill all Magit buffers." "Restore window configuration and kill all Magit buffers."
@ -594,7 +592,7 @@ With argument, do this that many times."
:config :config
(delete 'newline-mark whitespace-style) ; Don't paint $ at eol. (delete 'newline-mark whitespace-style) ; Don't paint $ at eol.
(delete 'lines whitespace-style) ; Don't paint lines red if too long. (delete 'lines whitespace-style) ; Don't paint lines red if too long.
;; Don't show dots in popup menus. ;; Workaround to not show dots in popup menus.
(defun my/whitespace-mode-enabled-p () (defun my/whitespace-mode-enabled-p ()
(symbol-value 'whitespace-mode)) (symbol-value 'whitespace-mode))
(defvar-local my/ws-enabled nil) (defvar-local my/ws-enabled nil)
@ -774,7 +772,7 @@ With argument, do this that many times."
(LaTeX-mode . company-auctex-init)) (LaTeX-mode . company-auctex-init))
;;;;;;;;;;;;;;;;;;;; (X)HTML / CSS ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;; (X)HTML / CSS ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Use company auto-completion. ;; Use company auto-completion for (X)HTML.
(use-package company-web (use-package company-web
:after company :after company
:config :config
@ -789,8 +787,10 @@ With argument, do this that many times."
(markup-title-0-face ((t (:inherit markup-gen-face :height 1.4)))) (markup-title-0-face ((t (:inherit markup-gen-face :height 1.4))))
(markup-title-1-face ((t (:inherit markup-gen-face :height 1.3)))) (markup-title-1-face ((t (:inherit markup-gen-face :height 1.3))))
(markup-title-2-face ((t (:inherit markup-gen-face :height 1.2)))) (markup-title-2-face ((t (:inherit markup-gen-face :height 1.2))))
(markup-title-3-face ((t (:inherit markup-gen-face :height 1.1 :weight bold)))) (markup-title-3-face ((t (:inherit markup-gen-face :height 1.1
(markup-title-4-face ((t (:inherit markup-gen-face :height 1.0 :underline t)))) :weight bold))))
(markup-title-4-face ((t (:inherit markup-gen-face :height 1.0
:underline t))))
:hook :hook
(adoc-mode . visual-line-mode)) (adoc-mode . visual-line-mode))
@ -799,13 +799,20 @@ With argument, do this that many times."
(markdown-command "cmark") (markdown-command "cmark")
:custom-face :custom-face
;; Style headers. ;; Style headers.
(markdown-header-face-1 ((t (:inherit markdown-header-face :height 1.4 :weight normal)))) (markdown-header-face-1 ((t (:inherit markdown-header-face :height 1.4
(markdown-header-face-2 ((t (:inherit markdown-header-face :height 1.3 :weight normal)))) :weight normal))))
(markdown-header-face-3 ((t (:inherit markdown-header-face :height 1.2 :weight normal)))) (markdown-header-face-2 ((t (:inherit markdown-header-face :height 1.3
(markdown-header-face-4 ((t (:inherit markdown-header-face :height 1.1 :weight bold)))) :weight normal))))
(markdown-header-face-5 ((t (:inherit markdown-header-face :height 1.0 :weight normal :underline t)))) (markdown-header-face-3 ((t (:inherit markdown-header-face :height 1.2
(markdown-header-face-6 ((t (:inherit markdown-header-face :height 1.0 :weight normal)))) :weight normal))))
(markdown-header-face-7 ((t (:inherit markdown-header-face :height 1.0 :weight normal)))) (markdown-header-face-4 ((t (:inherit markdown-header-face :height 1.1
:weight bold))))
(markdown-header-face-5 ((t (:inherit markdown-header-face :height 1.0
:weight normal :underline t))))
(markdown-header-face-6 ((t (:inherit markdown-header-face :height 1.0
:weight normal))))
(markdown-header-face-7 ((t (:inherit markdown-header-face :height 1.0
:weight normal))))
:mode :mode
(("README\\.md\\'" . gfm-mode) (("README\\.md\\'" . gfm-mode)
("\\.md\\'" . markdown-mode) ("\\.md\\'" . markdown-mode)