Merge branch 'master' of dragon.orbekk.com:/storage/projects/dotfiles

2 files changed, 17 insertions, 3 deletions

diff --git a/emacs/.doom.d/config.el b/emacs/.doom.d/config.el
index 556a2be..81c40b4 100644
--- a/emacs/.doom.d/config.el
+++ b/emacs/.doom.d/config.el
@@ -19,6 +19,7 @@
 ;; They all accept either a font-spec, font string ("Input Mono-12"), or xlfd
 ;; font string. You generally only need these two:
 (setq doom-font (font-spec :family "iosevka" :size 14))
+(setq doom-variable-pitch-font (font-spec :family "Noto Serif" :size 14))
 
 ;; There are two ways to load a theme. Both assume the theme is installed and
 ;; available. You can either set `doom-theme' or manually load a theme with the
@@ -26,6 +27,8 @@
 (setq doom-theme 'doom-dark+)
 (when (equal "pincer" (system-name))
   (setq doom-theme 'doom-one-light))
+(when (equal "orbekk" (system-name))
+  (setq doom-theme 'doom-acario-light))
 
 ;; If you use `org' and don't want your org files in the default location below,
 ;; change `org-directory'. It must be set before org loads!
@@ -40,11 +43,14 @@
 (setq org-agenda-files '("~/org/roam/todo.org"))
 (setq org-roam-directory (concat org-directory "/roam"))
 (setq org-roam-db-location (concat org-roam-directory "/org-roam.db"))
+(setq org-export-with-toc nil)
 (setq deft-directory org-directory)
 (setq deft-recursive t)
 
+
 ;; Allow more keys when navigating with avy.
-(setq avy-keys (number-sequence ?a ?z))
+(setq avy-keys '(?a ?o ?e ?u ?d ?h ?n ?s ?l ?, ?. ?p ?r))
+(setq avy-timeout-seconds 0.3)
 
 (server-start)
 (remove-hook 'doom-first-buffer-hook #'smartparens-global-mode)
@@ -52,4 +58,12 @@
 (after! racket-mode
   (remove-hook! 'racket-mode #'racket-smart-open-bracket-mode))
 
+(after! org
+  (add-hook 'org-mode-hook 'mixed-pitch-mode)
+  (setq org-roam-mode-section-functions
+        (list #'org-roam-backlinks-section
+              #'org-roam-reflinks-section
+              #'org-roam-unlinked-references-section
+              )))
+
 (load-file "~/.doom.d/config.local.el")
diff --git a/emacs/.doom.d/init.el b/emacs/.doom.d/init.el
index 89343dd..bf7dabb 100644
--- a/emacs/.doom.d/init.el
+++ b/emacs/.doom.d/init.el
@@ -46,9 +46,9 @@
        ;;unicode           ; extended unicode support for various languages
        vc-gutter         ; vcs diff in the fringe
        vi-tilde-fringe   ; fringe tildes to mark beyond EOB
-       window-select     ; visually switch windows
+       (window-select +numbers) ; visually switch windows
        workspaces        ; tab emulation, persistence & separate workspaces
-       ;;zen               ; distraction-free coding or writing
+       zen               ; distraction-free coding or writing
        (emoji +unicode)  ; 😇
 
        :editor