From 125e419f6ab8aef0c8ad2995bb8c6e41e88389d6 Mon Sep 17 00:00:00 2001 From: Matthew Kosarek Date: Sat, 3 Dec 2022 12:08:41 -0500 Subject: Death to org modern, and some better scrolling --- examples/test.org | 2 +- init.el | 4 ++-- lisp/general.el | 5 +++++ lisp/org-custom.el | 15 ++++++++------- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/examples/test.org b/examples/test.org index c7dc3ea..5cf589a 100644 --- a/examples/test.org +++ b/examples/test.org @@ -1,4 +1,4 @@ * Org - Hello world - This is my list -** +** TODO diff --git a/init.el b/init.el index 43bbcb2..670ed17 100644 --- a/init.el +++ b/init.el @@ -13,7 +13,7 @@ (setq package-list - '(doom-themes hl-todo python-mode org-bullets good-scroll counsel smartparens xref-js2 eglot json-mode markdown-mode emojify tern rtags cmake-ide cmake-mode tide auctex evil js2-highlight-vars ac-js2 js2-refactor js2-mode flycheck-irony company-irony all-the-icons req-package projectile irony org neotree minimap vterm vterm-toggle drag-stuff)) + '(highlight-thing tree-sitter-langs tree-sitter eldoc-box company-quickhelp hl-todo python-mode drag-stuff org-bullets git-gutter-fringe git-gutter vterm-toggle vterm minimap neotree good-scroll counsel smartparens xref-js2 eglot json-mode markdown-mode emojify tern rtags cmake-ide cmake-mode tide auctex evil js2-highlight-vars ac-js2 js2-refactor js2-mode flycheck-irony company-irony all-the-icons req-package projectile irony org)) ;; Fetch the list of packages available (unless package-archive-contents @@ -65,7 +65,7 @@ '(org-agenda-files (list org-directory)) '(org-directory "~/Documents/org") '(package-selected-packages - '(org-modern highlight-thing tree-sitter-langs tree-sitter eldoc-box company-quickhelp hl-todo python-mode drag-stuff org-bullets git-gutter-fringe git-gutter vterm-toggle vterm minimap neotree good-scroll counsel ## smartparens xref-js2 eglot json-mode markdown-mode emojify tern rtags cmake-ide cmake-mode tide auctex evil js2-highlight-vars ac-js2 js2-refactor js2-mode flycheck-irony company-irony all-the-icons req-package projectile irony org))) + '(highlight-thing tree-sitter-langs tree-sitter eldoc-box company-quickhelp hl-todo python-mode drag-stuff org-bullets git-gutter-fringe git-gutter vterm-toggle vterm minimap neotree good-scroll counsel ## smartparens xref-js2 eglot json-mode markdown-mode emojify tern rtags cmake-ide cmake-mode tide auctex evil js2-highlight-vars ac-js2 js2-refactor js2-mode flycheck-irony company-irony all-the-icons req-package projectile irony org))) ;;; init.el ends here (custom-set-faces diff --git a/lisp/general.el b/lisp/general.el index 871491c..899c983 100644 --- a/lisp/general.el +++ b/lisp/general.el @@ -21,6 +21,11 @@ (tool-bar-mode -1) (setq mac-shift-modifier 'meta) +;; Scroll +(pixel-scroll-mode 1) +(setq scroll-preserve-screen-position 1) +(setq scroll-conservatively 100) + ;; Tab mode (global-tab-line-mode t) diff --git a/lisp/org-custom.el b/lisp/org-custom.el index 3a4c7e7..9841bd6 100644 --- a/lisp/org-custom.el +++ b/lisp/org-custom.el @@ -52,8 +52,8 @@ (org-indent-mode 1) (visual-line-mode 1) - (setq org-blank-before-new-entry (quote ((heading . nil) - (plain-list-item . nil)))) + ;; (setq org-blank-before-new-entry (quote ((heading . nil) + ;; (plain-list-item . nil)))) (require 'flyspell) (flyspell-mode 1) @@ -67,13 +67,14 @@ '((sequence "TODO" "PROGRESS" "VERIFY" "|" "DONE" "ABANDONED"))) (setq org-todo-keyword-faces - '(("TODO" . "RED") ("PROGRESS" . "royal blue") ("VERIFY" . "#E0A526") ("ABANDONED" . "light gray") ("DONE" . "dark green"))) + '(("TODO" . (:foreground "RED")) + ("PROGRESS" . "royal blue") + ("VERIFY" . "#E0A526") + ("ABANDONED" . "light gray") + ("DONE" . "dark green")) + ) (add-hook 'org-mode-hook 'org-custom-hook) -(use-package org-modern - :config - (add-hook 'org-mode-hook #'org-modern-mode)) - (provide 'org-custom) ;;; org-custom.el ends here -- cgit v1.2.1