Browse Source

[emacs] [fonts] Add Noto Serif and org-mode serif fonts

Colin Powell 5 years ago
parent
commit
9328f2afea
76 changed files with 52 additions and 17 deletions
  1. 2 2
      alacritty/.config/alacritty/alacritty.yml
  2. 44 10
      emacs/.config/doom/config.org
  3. 5 5
      emacs/.config/doom/init.el
  4. 1 0
      emacs/.config/doom/packages.el
  5. BIN
      fonts/.fonts/noto-serif/NotoSerif-Black.ttf
  6. BIN
      fonts/.fonts/noto-serif/NotoSerif-BlackItalic.ttf
  7. BIN
      fonts/.fonts/noto-serif/NotoSerif-Bold.ttf
  8. BIN
      fonts/.fonts/noto-serif/NotoSerif-BoldItalic.ttf
  9. BIN
      fonts/.fonts/noto-serif/NotoSerif-Condensed.ttf
  10. BIN
      fonts/.fonts/noto-serif/NotoSerif-CondensedBlack.ttf
  11. BIN
      fonts/.fonts/noto-serif/NotoSerif-CondensedBlackItalic.ttf
  12. BIN
      fonts/.fonts/noto-serif/NotoSerif-CondensedBold.ttf
  13. BIN
      fonts/.fonts/noto-serif/NotoSerif-CondensedBoldItalic.ttf
  14. BIN
      fonts/.fonts/noto-serif/NotoSerif-CondensedExtraBold.ttf
  15. BIN
      fonts/.fonts/noto-serif/NotoSerif-CondensedExtraBoldItalic.ttf
  16. BIN
      fonts/.fonts/noto-serif/NotoSerif-CondensedExtraLight.ttf
  17. BIN
      fonts/.fonts/noto-serif/NotoSerif-CondensedExtraLightItalic.ttf
  18. BIN
      fonts/.fonts/noto-serif/NotoSerif-CondensedItalic.ttf
  19. BIN
      fonts/.fonts/noto-serif/NotoSerif-CondensedLight.ttf
  20. BIN
      fonts/.fonts/noto-serif/NotoSerif-CondensedLightItalic.ttf
  21. BIN
      fonts/.fonts/noto-serif/NotoSerif-CondensedMedium.ttf
  22. BIN
      fonts/.fonts/noto-serif/NotoSerif-CondensedMediumItalic.ttf
  23. BIN
      fonts/.fonts/noto-serif/NotoSerif-CondensedSemiBold.ttf
  24. BIN
      fonts/.fonts/noto-serif/NotoSerif-CondensedSemiBoldItalic.ttf
  25. BIN
      fonts/.fonts/noto-serif/NotoSerif-CondensedThin.ttf
  26. BIN
      fonts/.fonts/noto-serif/NotoSerif-CondensedThinItalic.ttf
  27. BIN
      fonts/.fonts/noto-serif/NotoSerif-ExtraBold.ttf
  28. BIN
      fonts/.fonts/noto-serif/NotoSerif-ExtraBoldItalic.ttf
  29. BIN
      fonts/.fonts/noto-serif/NotoSerif-ExtraCondensed.ttf
  30. BIN
      fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedBlack.ttf
  31. BIN
      fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedBlackItalic.ttf
  32. BIN
      fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedBold.ttf
  33. BIN
      fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedBoldItalic.ttf
  34. BIN
      fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedExtraBold.ttf
  35. BIN
      fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedExtraBoldItalic.ttf
  36. BIN
      fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedExtraLight.ttf
  37. BIN
      fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedExtraLightItalic.ttf
  38. BIN
      fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedItalic.ttf
  39. BIN
      fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedLight.ttf
  40. BIN
      fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedLightItalic.ttf
  41. BIN
      fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedMedium.ttf
  42. BIN
      fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedMediumItalic.ttf
  43. BIN
      fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedSemiBold.ttf
  44. BIN
      fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedSemiBoldItalic.ttf
  45. BIN
      fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedThin.ttf
  46. BIN
      fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedThinItalic.ttf
  47. BIN
      fonts/.fonts/noto-serif/NotoSerif-ExtraLight.ttf
  48. BIN
      fonts/.fonts/noto-serif/NotoSerif-ExtraLightItalic.ttf
  49. BIN
      fonts/.fonts/noto-serif/NotoSerif-Italic.ttf
  50. BIN
      fonts/.fonts/noto-serif/NotoSerif-Light.ttf
  51. BIN
      fonts/.fonts/noto-serif/NotoSerif-LightItalic.ttf
  52. BIN
      fonts/.fonts/noto-serif/NotoSerif-Medium.ttf
  53. BIN
      fonts/.fonts/noto-serif/NotoSerif-MediumItalic.ttf
  54. BIN
      fonts/.fonts/noto-serif/NotoSerif-Regular.ttf
  55. BIN
      fonts/.fonts/noto-serif/NotoSerif-SemiBold.ttf
  56. BIN
      fonts/.fonts/noto-serif/NotoSerif-SemiBoldItalic.ttf
  57. BIN
      fonts/.fonts/noto-serif/NotoSerif-SemiCondensed.ttf
  58. BIN
      fonts/.fonts/noto-serif/NotoSerif-SemiCondensedBlack.ttf
  59. BIN
      fonts/.fonts/noto-serif/NotoSerif-SemiCondensedBlackItalic.ttf
  60. BIN
      fonts/.fonts/noto-serif/NotoSerif-SemiCondensedBold.ttf
  61. BIN
      fonts/.fonts/noto-serif/NotoSerif-SemiCondensedBoldItalic.ttf
  62. BIN
      fonts/.fonts/noto-serif/NotoSerif-SemiCondensedExtraBold.ttf
  63. BIN
      fonts/.fonts/noto-serif/NotoSerif-SemiCondensedExtraBoldItalic.ttf
  64. BIN
      fonts/.fonts/noto-serif/NotoSerif-SemiCondensedExtraLight.ttf
  65. BIN
      fonts/.fonts/noto-serif/NotoSerif-SemiCondensedExtraLightItalic.ttf
  66. BIN
      fonts/.fonts/noto-serif/NotoSerif-SemiCondensedItalic.ttf
  67. BIN
      fonts/.fonts/noto-serif/NotoSerif-SemiCondensedLight.ttf
  68. BIN
      fonts/.fonts/noto-serif/NotoSerif-SemiCondensedLightItalic.ttf
  69. BIN
      fonts/.fonts/noto-serif/NotoSerif-SemiCondensedMedium.ttf
  70. BIN
      fonts/.fonts/noto-serif/NotoSerif-SemiCondensedMediumItalic.ttf
  71. BIN
      fonts/.fonts/noto-serif/NotoSerif-SemiCondensedSemiBold.ttf
  72. BIN
      fonts/.fonts/noto-serif/NotoSerif-SemiCondensedSemiBoldItalic.ttf
  73. BIN
      fonts/.fonts/noto-serif/NotoSerif-SemiCondensedThin.ttf
  74. BIN
      fonts/.fonts/noto-serif/NotoSerif-SemiCondensedThinItalic.ttf
  75. BIN
      fonts/.fonts/noto-serif/NotoSerif-Thin.ttf
  76. BIN
      fonts/.fonts/noto-serif/NotoSerif-ThinItalic.ttf

+ 2 - 2
alacritty/.config/alacritty/alacritty.yml

@@ -26,8 +26,8 @@ window:
   # Blank space added around the window in pixels. This padding is scaled
   # Blank space added around the window in pixels. This padding is scaled
   # by DPI and the specified value is always added at both opposing sides.
   # by DPI and the specified value is always added at both opposing sides.
   padding:
   padding:
-    x: 18
-    y: 18
+    x: 28
+    y: 28
 
 
   dynamic_padding: true
   dynamic_padding: true
 
 

+ 44 - 10
emacs/.config/doom/config.org

@@ -21,15 +21,16 @@ I change my default theme almost as often as the weather. I tend to revert back
 to Doom One most of the time, but I like the Kaolin themes, as well as Nimbus
 to Doom One most of the time, but I like the Kaolin themes, as well as Nimbus
 for it's retro charm. Nimbus just doesn't look great when I'm tired though.
 for it's retro charm. Nimbus just doesn't look great when I'm tired though.
 
 
-I love [[https://blog.golang.org/go-fonts][Go Mono]]. But sometimes Emacs is sensitive to fonts and performance
-suffers, so we have Fira Mono to fall back on.
+I love [[https://blog.golang.org/go-fonts][Go Mono]]. But sometimes Emacs is sensitive 
+to fonts and performance suffers, so we have Fira Mono to fall back on.
 
 
 #+BEGIN_SRC emacs-lisp
 #+BEGIN_SRC emacs-lisp
-(setq doom-font (font-spec :family "FuraCode Nerd Font Mono" :size 12))
-(setq doom-big-font (font-spec :family "FuraCode Nerd Font Mono" :size 17))
-(setq doom-theme 'doom-monokai-spectrum)
+(setq doom-font (font-spec :family "FuraCode Nerd Font Mono" :size 12)
+          doom-big-font (font-spec :family "FuraCode Nerd Font Mono" :size 17)
+          doom-variable-pitch-font (font-spec :family "Noto Serif" :size 12)
+          doom-serif-font (font-spec :family "FuraCode Nerd Font Mono")
+          doom-theme 'srcery)
 #+END_SRC
 #+END_SRC
-
 ** Borders
 ** Borders
 Barring the unfortunate end of X11 development and my eventual transition to
 Barring the unfortunate end of X11 development and my eventual transition to
 wayland and sway, you can pry i3wm from my cold, dead hands. One problem,
 wayland and sway, you can pry i3wm from my cold, dead hands. One problem,
@@ -38,14 +39,14 @@ border.
 
 
 #+BEGIN_SRC emacs-lisp
 #+BEGIN_SRC emacs-lisp
 ;; Applies to current frame
 ;; Applies to current frame
-(set-frame-parameter nil 'internal-border-width 20) ; applies to the current frame
+(set-frame-parameter nil 'internal-border-width 30) ; applies to the current frame
 ;; If we create new frames (via emacsclient) this will do the trick
 ;; If we create new frames (via emacsclient) this will do the trick
-(add-to-list 'default-frame-alist '(internal-border-width . 20))
+(add-to-list 'default-frame-alist '(internal-border-width . 30))
 ;; Dash highlighting
 ;; Dash highlighting
 (after! dash (dash-enable-font-lock))
 (after! dash (dash-enable-font-lock))
 #+END_SRC
 #+END_SRC
 ** Dash
 ** Dash
-I need to figure out what this doesr, hence the task below.
+I need to figure out what this does, hence the task below.
 #+BEGIN_SRC emacs-lisp
 #+BEGIN_SRC emacs-lisp
 ;; Dash highlighting
 ;; Dash highlighting
 (after! dash (dash-enable-font-lock))
 (after! dash (dash-enable-font-lock))
@@ -211,16 +212,45 @@ Helpful modes to make working less painful.
 #+END_SRC
 #+END_SRC
 * Org-mode
 * Org-mode
 ** Basic configuration
 ** Basic configuration
+
+Do I use deft? Not really. Every once in a while I think I will. This makes sure
+it works when I get an impulse.
 #+BEGIN_SRC emacs-lisp
 #+BEGIN_SRC emacs-lisp
-;; tools/deft
 (setq deft-extensions '("org"))
 (setq deft-extensions '("org"))
 (setq deft-directory "~/org")
 (setq deft-directory "~/org")
+#+END_SRC
 
 
+A handful of mods here clean up org mode. Line numbers don’t mean much when
+you’re folding and unfolding all the time. I also really enjoy the typography of
+a serif font when I’m writing a lot of words.
+
+#+BEGIN_SRC emacs-lisp
+(add-hook 'org-mode-hook #'doom-disable-line-numbers-h)
+(add-hook 'org-mode-hook 'typo-mode)
+; For org mode serif
+(add-hook 'org-mode-hook 'variable-pitch-mode)
+(add-hook 'org-mode-hook
+            '(lambda ()
+               (mapc
+                (lambda (face) ;; Other fonts with fixed-pitch.
+                  (set-face-attribute face nil :inherit 'fixed-pitch))
+                (list 'org-link
+                      'org-block
+                      'org-table
+                      'org-block-begin-line
+                      'org-block-end-line))))
+
+(add-hook 'org-mode-hook #'auto-fill-mode)
+(remove-hook 'org-mode-hook #'word-wrap-mode)
+#+END_SRC
+
+#+BEGIN_SRC emacs-lisp
 (after! org
 (after! org
   (setq org-directory (expand-file-name "~/org/")
   (setq org-directory (expand-file-name "~/org/")
         org-agenda-files (list org-directory)
         org-agenda-files (list org-directory)
         org-agenda-window-setup 'only-window
         org-agenda-window-setup 'only-window
         org-pretty-entities t
         org-pretty-entities t
+        org-agenda-dim-blocked-tasks nil
         org-log-done 'time
         org-log-done 'time
         org-fontify-whole-heading-line t
         org-fontify-whole-heading-line t
         org-fontify-done-headline t
         org-fontify-done-headline t
@@ -245,6 +275,10 @@ Helpful modes to make working less painful.
                       org-drill
                       org-drill
                       org-id)))
                       org-id)))
 
 
+;; Don’t display git gutter in org mode
+(after! git-gutter
+  (setq git-gutter:disabled-modes '(org-mode image-mode)))
+
 ;; Refiling
 ;; Refiling
 (setq org-refile-targets '((nil :maxlevel . 9)
 (setq org-refile-targets '((nil :maxlevel . 9)
                                 (org-agenda-files :maxlevel . 9)))
                                 (org-agenda-files :maxlevel . 9)))

+ 5 - 5
emacs/.config/doom/init.el

@@ -18,20 +18,20 @@
        doom              ; what makes DOOM look the way it does
        doom              ; what makes DOOM look the way it does
        doom-dashboard    ; a nifty spash screen for Emacs
        doom-dashboard    ; a nifty spash screen for Emacs
        doom-quit         ; DOOM quit-message prompts when you quit Emacs
        doom-quit         ; DOOM quit-message prompts when you quit Emacs
-       ;;fill-column       ; a `fill-column' indicator
+       ;;fill-column     ; a `fill-column' indicator
        hl-todo           ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
        hl-todo           ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
        ;;hydra
        ;;hydra
-       ;;indent-guides     ; highlighted indent columns
+       ;;indent-guides   ; highlighted indent columns
        modeline          ; snazzy, Atom-inspired modeline, plus API
        modeline          ; snazzy, Atom-inspired modeline, plus API
        nav-flash         ; blink the current line after jumping
        nav-flash         ; blink the current line after jumping
-       ;;neotree           ; a project drawer, like NERDTree for vim
+       ;;neotree         ; a project drawer, like NERDTree for vim
        ophints           ; highlight the region an operation acts on
        ophints           ; highlight the region an operation acts on
        (popup            ; tame sudden yet inevitable temporary windows
        (popup            ; tame sudden yet inevitable temporary windows
         +all             ; catch all popups that start with an asterix
         +all             ; catch all popups that start with an asterix
         +defaults)       ; default popup rules
         +defaults)       ; default popup rules
        ;;(pretty-code +fira)       ; replace bits of code with pretty symbols
        ;;(pretty-code +fira)       ; replace bits of code with pretty symbols
-       ;;tabbar            ; FIXME an (incomplete) tab bar for Emacs
-       ;;treemacs          ; a project drawer, like neotree but cooler
+       ;;tabbar          ; FIXME an (incomplete) tab bar for Emacs
+       treemacs        ; a project drawer, like neotree but cooler
        unicode           ; extended unicode support for various languages
        unicode           ; extended unicode support for various languages
        vc-gutter         ; vcs diff in the fringe
        vc-gutter         ; vcs diff in the fringe
        vi-tilde-fringe   ; fringe tildes to mark beyond EOB
        vi-tilde-fringe   ; fringe tildes to mark beyond EOB

+ 1 - 0
emacs/.config/doom/packages.el

@@ -62,6 +62,7 @@
 (package! mastodon)
 (package! mastodon)
 (package! magit-circleci)
 (package! magit-circleci)
 (package! smog)
 (package! smog)
+(package! writeroom-mode)
 
 
 ;; pretty tings up
 ;; pretty tings up
 (package! srcery-theme)
 (package! srcery-theme)

BIN
fonts/.fonts/noto-serif/NotoSerif-Black.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-BlackItalic.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-Bold.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-BoldItalic.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-Condensed.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-CondensedBlack.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-CondensedBlackItalic.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-CondensedBold.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-CondensedBoldItalic.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-CondensedExtraBold.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-CondensedExtraBoldItalic.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-CondensedExtraLight.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-CondensedExtraLightItalic.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-CondensedItalic.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-CondensedLight.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-CondensedLightItalic.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-CondensedMedium.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-CondensedMediumItalic.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-CondensedSemiBold.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-CondensedSemiBoldItalic.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-CondensedThin.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-CondensedThinItalic.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-ExtraBold.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-ExtraBoldItalic.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-ExtraCondensed.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedBlack.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedBlackItalic.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedBold.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedBoldItalic.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedExtraBold.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedExtraBoldItalic.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedExtraLight.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedExtraLightItalic.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedItalic.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedLight.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedLightItalic.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedMedium.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedMediumItalic.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedSemiBold.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedSemiBoldItalic.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedThin.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedThinItalic.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-ExtraLight.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-ExtraLightItalic.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-Italic.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-Light.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-LightItalic.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-Medium.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-MediumItalic.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-Regular.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-SemiBold.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-SemiBoldItalic.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-SemiCondensed.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-SemiCondensedBlack.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-SemiCondensedBlackItalic.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-SemiCondensedBold.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-SemiCondensedBoldItalic.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-SemiCondensedExtraBold.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-SemiCondensedExtraBoldItalic.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-SemiCondensedExtraLight.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-SemiCondensedExtraLightItalic.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-SemiCondensedItalic.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-SemiCondensedLight.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-SemiCondensedLightItalic.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-SemiCondensedMedium.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-SemiCondensedMediumItalic.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-SemiCondensedSemiBold.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-SemiCondensedSemiBoldItalic.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-SemiCondensedThin.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-SemiCondensedThinItalic.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-Thin.ttf


BIN
fonts/.fonts/noto-serif/NotoSerif-ThinItalic.ttf