summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--init.el2
-rw-r--r--lisp/general.el7
-rw-r--r--lisp/org-custom.el57
3 files changed, 20 insertions, 46 deletions
diff --git a/init.el b/init.el
index a752dfa..52a6fee 100644
--- a/init.el
+++ b/init.el
@@ -69,7 +69,7 @@
'(custom-safe-themes
'("3c83b3676d796422704082049fc38b6966bcad960f896669dfc21a7a37a748fa" "a27c00821ccfd5a78b01e4f35dc056706dd9ede09a8b90c6955ae6a390eb1c1e" default))
'(package-selected-packages
- '(doom-modeline material-theme esup glsl-mode fast-scroll yasnippet-snippets jsdoc helm-slack slack smart-mode-line magit rust-mode xref-js2 web-mode vterm-toggle vscode-dark-plus-theme treemacs-projectile tree-sitter-langs tide tern smartparens rtags req-package rainbow-mode pythonic python-mode perfect-margin org-roam org-notify org-modern org-bullets org-alert minimap markdown-mode json-mode js2-refactor js2-highlight-vars js-doc ido-vertical-mode hl-todo highlight-thing highlight-indent-guides helm-projectile helm-posframe helm-ag good-scroll go-mode git-gutter-fringe git-commit flycheck-irony evil eslint-fix emojify eldoc-box eglot drag-stuff doom-themes dashboard css-eldoc counsel company-quickhelp company-irony cmake-mode cmake-ide auctex all-the-icons ac-js2))
+ '(org-super-agenda doom-modeline material-theme esup glsl-mode fast-scroll yasnippet-snippets jsdoc helm-slack slack smart-mode-line magit rust-mode xref-js2 web-mode vterm-toggle vscode-dark-plus-theme treemacs-projectile tree-sitter-langs tide tern smartparens rtags req-package rainbow-mode pythonic python-mode perfect-margin org-roam org-notify org-modern org-bullets org-alert minimap markdown-mode json-mode js2-refactor js2-highlight-vars js-doc ido-vertical-mode hl-todo highlight-thing highlight-indent-guides helm-projectile helm-posframe helm-ag good-scroll go-mode git-gutter-fringe git-commit flycheck-irony evil eslint-fix emojify eldoc-box eglot drag-stuff doom-themes dashboard css-eldoc counsel company-quickhelp company-irony cmake-mode cmake-ide auctex all-the-icons ac-js2))
'(safe-local-variable-values '((js-indent-level . 4))))
(custom-set-faces
;; custom-set-faces was added by Custom.
diff --git a/lisp/general.el b/lisp/general.el
index f2bb678..c081276 100644
--- a/lisp/general.el
+++ b/lisp/general.el
@@ -54,9 +54,10 @@
;; Default Values
(setq-default indent-tabs-mode nil) ; use spaces only if nil
(setq-default tab-width 2) ; Assuming you want your tabs to be four spaces wide
- ;(set-face-attribute 'default nil :font "Source Code Pro-11")
-(set-face-attribute 'default nil :font "Monaco-10")
-(set-fontset-font t '(?😊 . ?😎) "Segoe UI Emoji")
+
+(setq default-font "JetBrains Mono Nerd")
+(setq default-font-size 14)
+(setq current-font-size default-font-size)
;;(set-face-attribute 'default nil :height 110 :family "Consolas")
(set-language-environment "UTF-8")
diff --git a/lisp/org-custom.el b/lisp/org-custom.el
index 77a4b08..43dd0e7 100644
--- a/lisp/org-custom.el
+++ b/lisp/org-custom.el
@@ -5,9 +5,6 @@
(defun org-custom-hook()
"Custom org mode hook."
(setq org-hide-emphasis-markers t)
- (font-lock-add-keywords 'org-mode
- '(("^ *\\([-]\\) "
- (0 (prog1 () (compose-region (match-beginning 1) (match-end 1) "•"))))))
(let* ((variable-tuple
(cond ((x-list-fonts "Iosevka") '(:font "Iosevka"))
@@ -28,64 +25,40 @@
`(org-level-1 ((t (,@headline ,@variable-tuple :height 1.5 :weight bold))))
`(org-document-title ((t (,@headline ,@variable-tuple :height 1.3 :weight:bold))))))
- ;; TODO: Temporarily commented out in favor of Material's design
- ;; (custom-theme-set-faces
- ;; 'user
- ;; '(org-block ((t (:inherit fixed-pitch))))
- ;; '(org-code ((t (:inherit (shadow fixed-pitch)))))
- ;; '(org-document-info ((t (:foreground "dark orange"))))
- ;; '(org-document-info-keyword ((t (:inherit (shadow fixed-pitch)))))
- ;; '(org-indent ((t (:inherit (org-hide fixed-pitch)))))
- ;; '(org-link ((t (:foreground "royal blue" :underline t))))
- ;; '(org-meta-line ((t (:inherit (font-lock-comment-face fixed-pitch)))))
- ;; '(org-property-value ((t (:inherit fixed-pitch))) t)
- ;; '(org-special-keyword ((t (:inherit (font-lock-comment-face fixed-pitch)))))
- ;; '(org-table ((t (:inherit fixed-pitch :foreground "#83a598"))))
- ;; '(org-tag ((t (:inherit (shadow fixed-pitch) :weight bold :height 0.8))))
- ;; '(org-verbatim ((t (:inherit (shadow fixed-pitch))))))
-
- ;; (variable-pitch-mode 1)
-
- ;; (use-package org-bullets
- ;; :ensure t
- ;; :config
- ;; (org-bullets-mode 1)
- ;; )
- (org-indent-mode 1)
- (visual-line-mode 1)
- ;; (setq org-blank-before-new-entry (quote ((heading . nil)
- ;; (plain-list-item . nil))))
-)
+ (variable-pitch-mode 1)
+
+ (use-package org-bullets
+ :ensure t
+ :config
+ (org-bullets-mode 1)
+ )
+
+ (org-indent-mode 1)
+ (visual-line-mode 1))
(setq org-directory "~/OrgRoam")
(setq org-agenda-files '("~/OrgRoam" "~/OrgRoam/daily"))
-;(setq org-agenda-files
-; (find-lisp-find-files "~/OrgRoam" "\.org$"))
+
(setq org-todo-keywords
'((sequence "TODO" "PROGRESS" "VERIFY" "|" "DONE" "ABANDONED")))
-;; TODO: Temporarily commented out in favor of Material's design
-;; (setq org-todo-keyword-faces
-;; '(("TODO" . (:foreground "RED"))
-;; ("PROGRESS" . "royal blue")
-;; ("VERIFY" . "#E0A526")
-;; ("ABANDONED" . "light gray")
-;; ("DONE" . "dark green"))
-;; )
(setq org-return-follows-link t)
(add-hook 'org-mode-hook 'org-custom-hook)
+(use-package org-super-agenda
+ :ensure t)
+
(use-package org-alert
:ensure t
:config
(org-alert-enable)
- (setq org-alert-interval 300
+ (setq org-alert-interval 6000 ; Once per hour!
org-alert-notify-cutoff 10
org-alert-notify-after-event-cutoff nil
alert-default-style 'libnotify))