From 72ca87a1157d7cde22dbc13f87e45f0235cec208 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Mon, 1 Mar 2021 05:12:41 +0300
Subject: [PATCH] emacs: adjust config for org-mode

---
 home/.config/doom/config.el   | 36 +++++++++++++++++++----------------
 home/.config/doom/init.el     | 19 +++++++++---------
 home/.config/doom/packages.el |  2 +-
 3 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/home/.config/doom/config.el b/home/.config/doom/config.el
index 2005bfb..023c53d 100644
--- a/home/.config/doom/config.el
+++ b/home/.config/doom/config.el
@@ -4,6 +4,10 @@
 (setq user-full-name "FollieHiyuki"
       user-mail-address "folliekazetani@protonmail.com")
 
+;; Set qutebrowser as the default browser
+(setq browse-url-browser-function 'browse-url-generic
+      browse-url-generic-program "qutebrowser")
+
 ;; Font settings
 (setq doom-font (font-spec :family "Iosevka Nerd Font" :size 16)
       doom-variable-pitch-font (font-spec :family "sans" :size 16)
@@ -51,6 +55,7 @@
 
 ;; Line number
 (setq display-line-numbers-type 'relative)
+(setq global-hl-line-modes nil)
 
 ;; Indent
 (setq-default
@@ -78,14 +83,13 @@
         projectile-auto-discover nil))
 
 ;; Ivy / Counsel
-(after! ivy
-  (use-package! all-the-icons-ivy-rich
-    :defer-incrementally counsel-projectile
-    :init (all-the-icons-ivy-rich-mode 1)
-    :config
-    (setq all-the-icons-ivy-rich-icon-size 1.0))
-  (use-package! ivy-rich
-    :defer-incrementally all-the-icons-ivy-rich))
+(use-package! all-the-icons-ivy-rich
+  :after counsel-projectile
+  :init (all-the-icons-ivy-rich-mode 1)
+  :config
+  (setq all-the-icons-ivy-rich-icon-size 1.0))
+(use-package! ivy-rich
+  :after all-the-icons-ivy-rich)
 (after! counsel
   (setq counsel-linux-app-format-function #'counsel-linux-app-format-function-name-only))
 (map! "C-M-j" 'counsel-switch-buffer)
@@ -113,16 +117,20 @@
 ;; Org mode
 (setq org-directory "~/Documents/Org/"
       org-journal-dir "~/Documents/Org/journal/"
-      org-noter-notes-search-path '("~/Documents/Org/notes/")
       org-agenda-files '("~/Documents/Org/agenda.org")
+      org-noter-notes-search-path '("~/Documents/Org/notes/")
       org-default-notes-file (expand-file-name "notes.org" org-directory)
       org-ellipsis "▾"
       org-hide-emphasis-markers t)
-(add-hook 'org-mode-hook (lambda () (org-superstar-mode 1)))
+(defun follie/comfy-org-editing ()
+  (setq visual-fill-column-width 160
+        visual-fill-column-center-text t)
+  (visual-fill-column-mode 1)
+  ;;(org-superstar-mode 1)
+  (display-line-numbers-mode -1))
+(add-hook 'org-mode-hook 'follie/comfy-org-editing)
 (use-package! org-tree-slide
   :commands org-tree-slide-mode
-  :hook ((org-tree-slide-play . (lambda () (display-line-numbers-mode -1)))
-         (org-tree-slide-stop . (lambda () (display-line-numbers-mode +1))))
   :config
   ;;(org-tree-slide-presentation-profile)
   (advice-remove 'org-tree-slide--display-tree-with-narrow #'+org-present--narrow-to-subtree-a)
@@ -146,10 +154,6 @@
   (async-bytecomp-package-mode 1)
   :custom (async-bytecomp-allowed-packages '(all)))
 
-;; Set qutebrowser as the default browser
-(setq browse-url-browser-function 'browse-url-generic
-      browse-url-generic-program "qutebrowser")
-
 ;; Magit
 (after! magit
   (setq magit-diff-refine-hunk 'all))
diff --git a/home/.config/doom/init.el b/home/.config/doom/init.el
index 9d33491..23b654a 100644
--- a/home/.config/doom/init.el
+++ b/home/.config/doom/init.el
@@ -100,7 +100,7 @@
 
        :tools
        ;;ansible
-       debugger          ; FIXME stepping through code, to help you add bugs
+       (debugger +lsp)   ; FIXME stepping through code, to help you add bugs
        direnv
        ;;docker
        editorconfig      ; let someone else argue about tabs vs spaces
@@ -166,14 +166,15 @@
        nix               ; I hereby declare "nix geht mehr!"
        ;;ocaml             ; an objective camel
        (org              ; organize your plain life in plain text
-         +dragndrop
-         ;;+gnuplot
-         ;;+jupyter
-         +journal
-         +present
-         +roam
-         +noter
-         +pandoc)
+        +pretty
+        +dragndrop
+        ;;+gnuplot
+        ;;+jupyter
+        +journal
+        +present
+        +roam
+        +noter
+        +pandoc)
        ;;php               ; perl's insecure younger brother
        ;;plantuml          ; diagrams for confusing people more
        ;;purescript        ; javascript, but functional
diff --git a/home/.config/doom/packages.el b/home/.config/doom/packages.el
index 0ec90f1..c0b19fc 100644
--- a/home/.config/doom/packages.el
+++ b/home/.config/doom/packages.el
@@ -56,6 +56,7 @@
 (package! ebuku)
 (package! counsel-web)
 (package! pinentry)
+(package! sudoku)
 ;;(package! system-packages)
 ;;(package! emms)
 ;;(package! emms-mode-line-cycle)
@@ -64,7 +65,6 @@
 
 ;; Additional modes
 (package! vimrc-mode)
-(package! org-superstar) ;; Don't need org-fancy-priorities from +pretty
 
 ;; Improvements
 (package! magit-delta)