olivetti and theme tweaks orui and org capture keybinds

4 files changed, 19 insertions, 11 deletions

diff --git a/bard-emacs-modules/bard-emacs-org.el b/bard-emacs-modules/bard-emacs-org.el
index 1e0c551..1e4e50d 100644
--- a/bard-emacs-modules/bard-emacs-org.el
+++ b/bard-emacs-modules/bard-emacs-org.el
@@ -76,6 +76,8 @@
                       (org-agenda-overriding-header "Upcoming this month\n")))))))
 
 ;; Org capture templates
+(define-key global-map (kbd "C-`") #'org-capture)
+
 (setq org-capture-templates
       '(("h" "Homework" entry (file+olp "~/Notes/Org-Roam/todo.org" "Inbox" "Homework")
          "* TODO %?")
diff --git a/bard-emacs-modules/bard-emacs-package.el b/bard-emacs-modules/bard-emacs-package.el
index ccd5339..5bb7028 100644
--- a/bard-emacs-modules/bard-emacs-package.el
+++ b/bard-emacs-modules/bard-emacs-package.el
@@ -31,6 +31,7 @@
 (use-package modus-themes
   :ensure t
   :config
+  (setq modus-themes-to-toggle '(modus-vivendi modus-operandi-tinted))
   (define-key global-map (kbd "M-<f5>") #'modus-themes-toggle))
 
 (use-package rainbow-mode
@@ -97,6 +98,9 @@
   :config
   (org-roam-db-autosync-mode 1))
 
+(use-package org-roam-ui
+  :ensure t)
+
 (use-package orderless
   :ensure t
   :custom
diff --git a/bard-emacs-modules/bard-emacs-ui.el b/bard-emacs-modules/bard-emacs-ui.el
index d725e8a..9b80886 100644
--- a/bard-emacs-modules/bard-emacs-ui.el
+++ b/bard-emacs-modules/bard-emacs-ui.el
@@ -57,33 +57,22 @@
     "Distraction-free writing environment"
     (if (equal olivetti-mode nil)
         (progn
-          (window-configuration-to-register 1)
-          (delete-other-windows)
           (text-scale-set 0.2)
           (setq olivetti-body-width 100)
           (olivetti-mode t))
-      ;; TODO turn off line numbers
       (progn
-        (if (eq (length (window-list)) 1)
-            (jump-to-register 1))
         (olivetti-mode 0)
         (text-scale-set 0)
         (mixed-pitch-mode 0)
-	;; TODO turn restore line numbers
         (setq cursor-type 'box))))
   (defun bard/olivetti-toggle ()
     "Distraction-free writing environment"
     (if (equal olivetti-mode nil)
         (progn
-          (window-configuration-to-register 1)
-          (delete-other-windows)
           (text-scale-set 0.2)
           (setq olivetti-body-width 100)
-	  (display-line-numbers-mode 0)
           (olivetti-mode t))
       (progn
-        (if (eq (length (window-list)) 1)
-            (jump-to-register 1))
         (olivetti-mode 0)
         (text-scale-set 0)
         (mixed-pitch-mode 0)
diff --git a/init.el b/init.el
index d2fae05..f3a2998 100644
--- a/init.el
+++ b/init.el
@@ -74,3 +74,16 @@
 (provide 'init)
 
 ;;; init.el ends here
+(custom-set-variables
+ ;; custom-set-variables was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
+ '(package-selected-packages
+   '(org-roam-ui vterm yasnippet-snippets which-key vertico use-package toc-org tao-theme rainbow-mode projectile pdf-tools org-roam org-cliplink orderless olivetti multiple-cursors modus-themes mixed-pitch marginalia magit hl-todo haskell-mode expand-region elfeed-org elfeed-goodies ef-themes dashboard counsel company clojure-snippets cider)))
+(custom-set-faces
+ ;; custom-set-faces was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
+ '(org-agenda-structure ((t (:inherit bold :foreground "#70a89f" :height 1.5 :family "Iosevka Comfy Motion Duo")))))