diff options
| -rw-r--r-- | bard-emacs-modules/bard-emacs-org.el | 6 | ||||
| -rw-r--r-- | bard-emacs-modules/bard-emacs-package.el | 39 | ||||
| -rw-r--r-- | bard-emacs-modules/bard-emacs-ui.el | 16 | ||||
| -rw-r--r-- | bookmarks | 18 | ||||
| -rw-r--r-- | init.el | 13 |
5 files changed, 37 insertions, 55 deletions
diff --git a/bard-emacs-modules/bard-emacs-org.el b/bard-emacs-modules/bard-emacs-org.el index cb31536..b2691f5 100644 --- a/bard-emacs-modules/bard-emacs-org.el +++ b/bard-emacs-modules/bard-emacs-org.el @@ -86,10 +86,10 @@ "* TODO %?") ("r" "Reading List" entry (file+olp "~/Notes/Org-Roam/todo.org" "Inbox" "Immediate Reading List") "* %?") - ("p" "Protocol" entry (file+olp "~/Notes/Org-Roam/media.org" "Watch/Read List" "Quotes") - "* Source: [[%:link][%:description]]\n#+BEGIN_QUOTE\n%i\n#+END_QUOTE\n\n\n%?") + ("p" "Protocol" entry (file+olp "~/Notes/Org-Roam/media.org" "Quotes") + "* Source: [[%:link][%:description]]\n#+BEGIN_QUOTE\n%i\n#+END_QUOTE\n%?") ("L" "Protocol Link" entry (file+olp "~/Notes/Org-Roam/media.org" "Watch/Read List") - "* [[%:link][%:description]] \nCaptured On: %U \n** Notes:\n%?") + "* [[%:link][%:description]] \nCaptured On: %U \n%?") ("j" "Journal" entry (file+datetree "~/Notes/Org-Roam/journal.org") "* %U %^{Title}\n %?") ("a" "Appointments" entry (file+olp "~/Notes/Org-Roam/todo.org" "Appointments") diff --git a/bard-emacs-modules/bard-emacs-package.el b/bard-emacs-modules/bard-emacs-package.el index 5bb7028..8075eaf 100644 --- a/bard-emacs-modules/bard-emacs-package.el +++ b/bard-emacs-modules/bard-emacs-package.el @@ -21,18 +21,24 @@ (setq use-package-always-ensure t) ;; Ef-themes -(use-package ef-themes +;; (use-package ef-themes +;; :ensure t +;; :config +;; ;; (load-theme 'ef-cyprus t) +;; (define-key global-map (kbd "<f5>") #'ef-themes-toggle) +;; (setq ef-themes-to-toggle '(ef-autumn ef-cyprus))) + +;; (use-package modus-themes +;; :ensure t +;; :config +;; ;; (load-theme 'modus-operandi-tinted t) +;; (setq modus-themes-to-toggle '(modus-vivendi modus-operandi-tinted)) +;; (define-key global-map (kbd "M-<f5>") #'modus-themes-toggle)) + +(use-package zenburn-theme :ensure t :config - (load-theme 'ef-cyprus t) - (define-key global-map (kbd "<f5>") #'ef-themes-toggle) - (setq ef-themes-to-toggle '(ef-autumn ef-cyprus))) - -(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)) + (load-theme 'zenburn t)) (use-package rainbow-mode :ensure t) @@ -160,12 +166,13 @@ (global-hl-todo-mode t) :config (setq hl-todo-keyword-faces - '(("TODO" error bold) - ("FIXME" error bold) - ("WAIT" warning bold) - ("HACK" font-lock-constant-face bold) - ("DEPRECATED" font-lock-doc-face bold) - ("BUG" error bold)))) + '(("TODO" error bold) + ("FIXME" error bold) + ("WAIT" warning bold) + ("HACK" font-lock-constant-face bold) + ("DEPRECATED" font-lock-doc-face bold) + ("DONE" font-lock-doc-face bold) + ("BUG" error bold)))) (use-package pdf-tools :ensure t) diff --git a/bard-emacs-modules/bard-emacs-ui.el b/bard-emacs-modules/bard-emacs-ui.el index 9b80886..c76786a 100644 --- a/bard-emacs-modules/bard-emacs-ui.el +++ b/bard-emacs-modules/bard-emacs-ui.el @@ -52,20 +52,8 @@ ;; olivetti (use-package olivetti :config - (defun bard/olivetti-toggle-interactive () - (interactive) - "Distraction-free writing environment" - (if (equal olivetti-mode nil) - (progn - (text-scale-set 0.2) - (setq olivetti-body-width 100) - (olivetti-mode t)) - (progn - (olivetti-mode 0) - (text-scale-set 0) - (mixed-pitch-mode 0) - (setq cursor-type 'box)))) (defun bard/olivetti-toggle () + (interactive) "Distraction-free writing environment" (if (equal olivetti-mode nil) (progn @@ -78,7 +66,7 @@ (mixed-pitch-mode 0) (setq cursor-type 'box)))) :bind - (("<f9>" . bard/olivetti-toggle-interactive))) + (("<f9>" . bard/olivetti-toggle))) (provide 'bard-emacs-ui) @@ -2,11 +2,16 @@ ;;; This format is meant to be slightly human-readable; ;;; nevertheless, you probably don't want to edit it. ;;; -*- End Of Bookmark File Format Version Stamp -*- -(("org-capture-last-stored" +(("todo.org" (filename . "~/Notes/Org-Roam/todo.org") - (front-context-string . "*** test\nSource:") - (rear-context-string . ":57] \n** Quotes\n") - (position . 2147)) + (front-context-string . ":PROPERTIES:\n:ID") + (rear-context-string) + (position . 1)) +("org-capture-last-stored" + (filename . "~/Notes/Org-Roam/media.org") + (front-context-string . "*** Source: [[ht") + (rear-context-string . ":44] \n** Quotes\n") + (position . 2004)) ("School" (filename . "~/Documents/School/") (front-context-string . "APUSH.pdf\n -rw-") @@ -22,11 +27,6 @@ (front-context-string . "codeforces\n drw") (rear-context-string . "96 Sep 20 07:15 ") (position . 211)) -("Work" - (filename . "~/Notes/Org-Roam/todo.org") - (front-context-string . ":PROPERTIES:\n:ID") - (rear-context-string) - (position . 1)) ("conmerge" (filename . "~/Code/conmerge/") (front-context-string . "CHANGELOG.md\n d") @@ -74,16 +74,3 @@ (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"))))) |