Compare commits

..

No commits in common. "cf47b7f750f92af60ecad793dd99ba538e5dbcff" and "b20f578afaed641a30d5fb76f28dcadac90f21ed" have entirely different histories.

View file

@ -348,12 +348,6 @@ And disable this for some modes.
(add-hook 'eww-mode-hook (lambda () (display-line-numbers-mode -1))) (add-hook 'eww-mode-hook (lambda () (display-line-numbers-mode -1)))
#+end_src #+end_src
But when Emacs shows line numbers, they should be relative. Why? Ever tried =20j= in Evil mode or =C-u 20 C-p= in Emacs?
#+begin_src emacs-lisp
(setq display-line-numbers-type 'relative)
#+end_src
** Replace selected text by typing ** Replace selected text by typing
#+begin_src emacs-lisp #+begin_src emacs-lisp
@ -473,9 +467,7 @@ During the last weeks I got used to using a light theme during daytime and a dar
(defun mmk2410/switch-theme (theme) (defun mmk2410/switch-theme (theme)
(mapcar 'disable-theme custom-enabled-themes) (mapcar 'disable-theme custom-enabled-themes)
(load-theme theme t) (load-theme theme t))
(mmk2410/org-font-adjust-headlines)
(mmk2410/org-font-adjust-variable-pitch))
(defun mmk2410/switch-theme-night () (defun mmk2410/switch-theme-night ()
(interactive) (interactive)
@ -876,8 +868,7 @@ Hide emphasis markers. While this sometimes is very distracting it mostly looks
I like to have larger headlines in Org for better identifying them. The configuration of [[https://config.daviwil.com/emacs#fonts-and-bullets][David Wilson]] was a large help in this regard. I like to have larger headlines in Org for better identifying them. The configuration of [[https://config.daviwil.com/emacs#fonts-and-bullets][David Wilson]] was a large help in this regard.
#+begin_src emacs-lisp #+begin_src emacs-lisp
(defun mmk2410/org-font-adjust-headlines () (with-eval-after-load 'org
"Adjust headline sizes, font family and weight"
(dolist (face '((org-level-1 . 1.4) (dolist (face '((org-level-1 . 1.4)
(org-level-2 . 1.3) (org-level-2 . 1.3)
(org-level-3 . 1.2) (org-level-3 . 1.2)
@ -888,15 +879,12 @@ I like to have larger headlines in Org for better identifying them. The configur
(org-level-8 . 1.1))) (org-level-8 . 1.1)))
(set-face-attribute (car face) nil :font "Open Sans" :weight 'bold :height (cdr face)))) (set-face-attribute (car face) nil :font "Open Sans" :weight 'bold :height (cdr face))))
(with-eval-after-load 'org
(mmk2410/org-font-adjust-headlines))
#+end_src #+end_src
When using a variable-pitch font this also applies to stuff like code blocks. The following block resets this change for these unwanted faces. When using a variable-pitch font this also applies to stuff like code blocks. The following block resets this change for these unwanted faces.
#+begin_src emacs-lisp #+begin_src emacs-lisp
(defun mmk2410/org-font-adjust-variable-pitch () (with-eval-after-load 'org
"Re-delare certain org font as fixed pitch when using variable pitch mode."
(org-indent-mode) (org-indent-mode)
(set-face-attribute 'org-block nil :foreground nil :inherit 'fixed-pitch) (set-face-attribute 'org-block nil :foreground nil :inherit 'fixed-pitch)
(set-face-attribute 'org-code nil :inherit '(shadow fixed-pitch)) (set-face-attribute 'org-code nil :inherit '(shadow fixed-pitch))
@ -905,9 +893,6 @@ When using a variable-pitch font this also applies to stuff like code blocks. Th
(set-face-attribute 'org-special-keyword nil :inherit '(font-lock-comment-face fixed-pitch)) (set-face-attribute 'org-special-keyword nil :inherit '(font-lock-comment-face fixed-pitch))
(set-face-attribute 'org-meta-line nil :inherit '(font-lock-comment-face fixed-pitch)) (set-face-attribute 'org-meta-line nil :inherit '(font-lock-comment-face fixed-pitch))
(set-face-attribute 'org-checkbox nil :inherit 'fixed-pitch)) (set-face-attribute 'org-checkbox nil :inherit 'fixed-pitch))
(with-eval-after-load 'org
(mmk2410/org-font-adjust-variable-pitch))
#+end_src #+end_src
** Org Superstar Mode ** Org Superstar Mode
@ -1604,11 +1589,7 @@ Source: [[https://github.com/fxbois/web-mode][GitHub: fxbois/web-mode]]
("\\.mustache\\'" . web-mode) ("\\.mustache\\'" . web-mode)
("\\.djhtml\\'" . web-mode) ("\\.djhtml\\'" . web-mode)
("\\.vue\\'" . web-mode) ("\\.vue\\'" . web-mode)
("\\.blade\\.php\\'" . web-mode)) ("\\.blade\\.php\\'" . web-mode)))
:config
(setq web-mode-script-padding 0)
(setq web-mode-code-indent-offset 2)
(setq web-mode-markup-indent-offset 2))
#+end_src #+end_src
** TypoScript ** TypoScript
@ -1622,13 +1603,6 @@ Source: [[https://github.com/ksjogo/typoscript-mode][GitHub: ksjogo/typoscript-m
:mode "\\.typoscript\\'") :mode "\\.typoscript\\'")
#+end_src #+end_src
#+begin_src emacs-lisp
(use-package js
:config
(setq js-indent-level 2))
#+end_src
** YAML ** YAML
YAML major mode for Emacs. YAML major mode for Emacs.
@ -2145,7 +2119,7 @@ Now define the contexts.
(string-prefix-p "/work" (mu4e-message-field msg :maildir)))) (string-prefix-p "/work" (mu4e-message-field msg :maildir))))
:vars '( ( user-mail-address . "m.kapfer@emplify-software.de" ) :vars '( ( user-mail-address . "m.kapfer@emplify-software.de" )
( user-full-name . "Marcel Kapfer" ) ( user-full-name . "Marcel Kapfer" )
( message-signature-file . "~/dotfiles/dot-work/signature/mu4e") ( message-signature-file . nil)
( mu4e-sent-folder . "/work/Sent Items" ) ( mu4e-sent-folder . "/work/Sent Items" )
( mu4e-drafts-folder . "/work/Drafts" ) ( mu4e-drafts-folder . "/work/Drafts" )
( mu4e-trash-folder . "/work/Trash" ) ( mu4e-trash-folder . "/work/Trash" )
@ -2195,14 +2169,6 @@ Now define the contexts.
** Other settings ** Other settings
The [[https://github.com/org-mime/org-mime][org-mime]] package thankfully allows sending HTML mails from mu4e. Not that I like HTML mails but I need to have a special HTML message signature for work.
#+begin_src emacs-lisp
(use-package org-mime
:after (org mu4e)
:config (setq org-mime-library 'mml))
#+end_src
Mu4e displays a message in the minibuffer after refreshing. And since I run mbsync and mu index (through emacsclient) automatically every few minutes these messages can get quite distracting. Luckily mu4e provides an option to disable these index messages. Mu4e displays a message in the minibuffer after refreshing. And since I run mbsync and mu index (through emacsclient) automatically every few minutes these messages can get quite distracting. Luckily mu4e provides an option to disable these index messages.
#+begin_src emacs-lisp #+begin_src emacs-lisp