浏览代码

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

Colin Powell 5 年之前
父节点
当前提交
9328f2afea
共有 76 个文件被更改,包括 52 次插入17 次删除
  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. 二进制
      fonts/.fonts/noto-serif/NotoSerif-Black.ttf
  6. 二进制
      fonts/.fonts/noto-serif/NotoSerif-BlackItalic.ttf
  7. 二进制
      fonts/.fonts/noto-serif/NotoSerif-Bold.ttf
  8. 二进制
      fonts/.fonts/noto-serif/NotoSerif-BoldItalic.ttf
  9. 二进制
      fonts/.fonts/noto-serif/NotoSerif-Condensed.ttf
  10. 二进制
      fonts/.fonts/noto-serif/NotoSerif-CondensedBlack.ttf
  11. 二进制
      fonts/.fonts/noto-serif/NotoSerif-CondensedBlackItalic.ttf
  12. 二进制
      fonts/.fonts/noto-serif/NotoSerif-CondensedBold.ttf
  13. 二进制
      fonts/.fonts/noto-serif/NotoSerif-CondensedBoldItalic.ttf
  14. 二进制
      fonts/.fonts/noto-serif/NotoSerif-CondensedExtraBold.ttf
  15. 二进制
      fonts/.fonts/noto-serif/NotoSerif-CondensedExtraBoldItalic.ttf
  16. 二进制
      fonts/.fonts/noto-serif/NotoSerif-CondensedExtraLight.ttf
  17. 二进制
      fonts/.fonts/noto-serif/NotoSerif-CondensedExtraLightItalic.ttf
  18. 二进制
      fonts/.fonts/noto-serif/NotoSerif-CondensedItalic.ttf
  19. 二进制
      fonts/.fonts/noto-serif/NotoSerif-CondensedLight.ttf
  20. 二进制
      fonts/.fonts/noto-serif/NotoSerif-CondensedLightItalic.ttf
  21. 二进制
      fonts/.fonts/noto-serif/NotoSerif-CondensedMedium.ttf
  22. 二进制
      fonts/.fonts/noto-serif/NotoSerif-CondensedMediumItalic.ttf
  23. 二进制
      fonts/.fonts/noto-serif/NotoSerif-CondensedSemiBold.ttf
  24. 二进制
      fonts/.fonts/noto-serif/NotoSerif-CondensedSemiBoldItalic.ttf
  25. 二进制
      fonts/.fonts/noto-serif/NotoSerif-CondensedThin.ttf
  26. 二进制
      fonts/.fonts/noto-serif/NotoSerif-CondensedThinItalic.ttf
  27. 二进制
      fonts/.fonts/noto-serif/NotoSerif-ExtraBold.ttf
  28. 二进制
      fonts/.fonts/noto-serif/NotoSerif-ExtraBoldItalic.ttf
  29. 二进制
      fonts/.fonts/noto-serif/NotoSerif-ExtraCondensed.ttf
  30. 二进制
      fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedBlack.ttf
  31. 二进制
      fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedBlackItalic.ttf
  32. 二进制
      fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedBold.ttf
  33. 二进制
      fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedBoldItalic.ttf
  34. 二进制
      fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedExtraBold.ttf
  35. 二进制
      fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedExtraBoldItalic.ttf
  36. 二进制
      fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedExtraLight.ttf
  37. 二进制
      fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedExtraLightItalic.ttf
  38. 二进制
      fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedItalic.ttf
  39. 二进制
      fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedLight.ttf
  40. 二进制
      fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedLightItalic.ttf
  41. 二进制
      fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedMedium.ttf
  42. 二进制
      fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedMediumItalic.ttf
  43. 二进制
      fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedSemiBold.ttf
  44. 二进制
      fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedSemiBoldItalic.ttf
  45. 二进制
      fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedThin.ttf
  46. 二进制
      fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedThinItalic.ttf
  47. 二进制
      fonts/.fonts/noto-serif/NotoSerif-ExtraLight.ttf
  48. 二进制
      fonts/.fonts/noto-serif/NotoSerif-ExtraLightItalic.ttf
  49. 二进制
      fonts/.fonts/noto-serif/NotoSerif-Italic.ttf
  50. 二进制
      fonts/.fonts/noto-serif/NotoSerif-Light.ttf
  51. 二进制
      fonts/.fonts/noto-serif/NotoSerif-LightItalic.ttf
  52. 二进制
      fonts/.fonts/noto-serif/NotoSerif-Medium.ttf
  53. 二进制
      fonts/.fonts/noto-serif/NotoSerif-MediumItalic.ttf
  54. 二进制
      fonts/.fonts/noto-serif/NotoSerif-Regular.ttf
  55. 二进制
      fonts/.fonts/noto-serif/NotoSerif-SemiBold.ttf
  56. 二进制
      fonts/.fonts/noto-serif/NotoSerif-SemiBoldItalic.ttf
  57. 二进制
      fonts/.fonts/noto-serif/NotoSerif-SemiCondensed.ttf
  58. 二进制
      fonts/.fonts/noto-serif/NotoSerif-SemiCondensedBlack.ttf
  59. 二进制
      fonts/.fonts/noto-serif/NotoSerif-SemiCondensedBlackItalic.ttf
  60. 二进制
      fonts/.fonts/noto-serif/NotoSerif-SemiCondensedBold.ttf
  61. 二进制
      fonts/.fonts/noto-serif/NotoSerif-SemiCondensedBoldItalic.ttf
  62. 二进制
      fonts/.fonts/noto-serif/NotoSerif-SemiCondensedExtraBold.ttf
  63. 二进制
      fonts/.fonts/noto-serif/NotoSerif-SemiCondensedExtraBoldItalic.ttf
  64. 二进制
      fonts/.fonts/noto-serif/NotoSerif-SemiCondensedExtraLight.ttf
  65. 二进制
      fonts/.fonts/noto-serif/NotoSerif-SemiCondensedExtraLightItalic.ttf
  66. 二进制
      fonts/.fonts/noto-serif/NotoSerif-SemiCondensedItalic.ttf
  67. 二进制
      fonts/.fonts/noto-serif/NotoSerif-SemiCondensedLight.ttf
  68. 二进制
      fonts/.fonts/noto-serif/NotoSerif-SemiCondensedLightItalic.ttf
  69. 二进制
      fonts/.fonts/noto-serif/NotoSerif-SemiCondensedMedium.ttf
  70. 二进制
      fonts/.fonts/noto-serif/NotoSerif-SemiCondensedMediumItalic.ttf
  71. 二进制
      fonts/.fonts/noto-serif/NotoSerif-SemiCondensedSemiBold.ttf
  72. 二进制
      fonts/.fonts/noto-serif/NotoSerif-SemiCondensedSemiBoldItalic.ttf
  73. 二进制
      fonts/.fonts/noto-serif/NotoSerif-SemiCondensedThin.ttf
  74. 二进制
      fonts/.fonts/noto-serif/NotoSerif-SemiCondensedThinItalic.ttf
  75. 二进制
      fonts/.fonts/noto-serif/NotoSerif-Thin.ttf
  76. 二进制
      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)

二进制
fonts/.fonts/noto-serif/NotoSerif-Black.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-BlackItalic.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-Bold.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-BoldItalic.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-Condensed.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-CondensedBlack.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-CondensedBlackItalic.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-CondensedBold.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-CondensedBoldItalic.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-CondensedExtraBold.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-CondensedExtraBoldItalic.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-CondensedExtraLight.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-CondensedExtraLightItalic.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-CondensedItalic.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-CondensedLight.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-CondensedLightItalic.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-CondensedMedium.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-CondensedMediumItalic.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-CondensedSemiBold.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-CondensedSemiBoldItalic.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-CondensedThin.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-CondensedThinItalic.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-ExtraBold.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-ExtraBoldItalic.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-ExtraCondensed.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedBlack.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedBlackItalic.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedBold.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedBoldItalic.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedExtraBold.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedExtraBoldItalic.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedExtraLight.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedExtraLightItalic.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedItalic.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedLight.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedLightItalic.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedMedium.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedMediumItalic.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedSemiBold.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedSemiBoldItalic.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedThin.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-ExtraCondensedThinItalic.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-ExtraLight.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-ExtraLightItalic.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-Italic.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-Light.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-LightItalic.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-Medium.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-MediumItalic.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-Regular.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-SemiBold.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-SemiBoldItalic.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-SemiCondensed.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-SemiCondensedBlack.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-SemiCondensedBlackItalic.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-SemiCondensedBold.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-SemiCondensedBoldItalic.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-SemiCondensedExtraBold.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-SemiCondensedExtraBoldItalic.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-SemiCondensedExtraLight.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-SemiCondensedExtraLightItalic.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-SemiCondensedItalic.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-SemiCondensedLight.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-SemiCondensedLightItalic.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-SemiCondensedMedium.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-SemiCondensedMediumItalic.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-SemiCondensedSemiBold.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-SemiCondensedSemiBoldItalic.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-SemiCondensedThin.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-SemiCondensedThinItalic.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-Thin.ttf


二进制
fonts/.fonts/noto-serif/NotoSerif-ThinItalic.ttf