sync

3 files changed, 131 insertions, 100 deletions

diff --git a/config.el b/config.el
index 93dee21..e6902a2 100644
--- a/config.el
+++ b/config.el
@@ -847,40 +847,12 @@ and convert it to Org using the pandoc utility."
            (function my/org-capture-denote-scheduled)
            "" :immediate-finish t :jump-to-captured t))))
 
-(setq org-agenda-span 'day)
-
 (use-package org-super-agenda
   :after org-agenda
   :init
   :config
   (org-super-agenda-mode))
 
-(use-package org-reschedule-by-rule
-  :straight (:host github :repo "Raemi/org-reschedule-by-rule")
-  :ensure t
-  :after org
-  :config
-  (setq org-reschedule-by-rule-rules
-    '(
-      (:name "Overdue to tomorrow"
-       :condition (lambda ()
-         (and (org-entry-get (point) "SCHEDULED")
-              (not (org-entry-is-done-p))
-              (< (org-time-string-to-seconds
-                   (org-entry-get (point) "SCHEDULED"))
-                 (org-time-string-to-seconds (format-time-string "<%Y-%m-%d>")))))
-       :action (lambda ()
-         (org-schedule nil (format-time-string "<%Y-%m-%d>" (time-add (current-time) (days-to-time 1))))))
-
-      (:name "Weekly reset to Monday"
-       :condition (lambda ()
-         (and (org-entry-get (point) "SCHEDULED")
-              (org-entry-is-done-p)
-              (member (org-entry-get (point) "TODO") '("ACTIVE" "NEXT"))))
-       :action (lambda ()
-         (org-schedule nil (format-time-string "<%Y-%m-%d>" (org-read-date nil nil "next Monday")))))
-      )))
-
 ;; (use-package org-ql
 ;;   :ensure t
 ;;   :after org-super-agenda
@@ -1150,7 +1122,6 @@ and convert it to Org using the pandoc utility."
 (setq split-width-threshold 0)
 (setq split-height-threshold nil)
 
-
 (setq org-priority-faces
   '((?A . (:foreground "#ff6b6b" :weight bold))
     (?B . (:foreground "#ffd93d" :weight bold))
@@ -1175,7 +1146,27 @@ and convert it to Org using the pandoc utility."
 (setq org-todo-keywords
   '((sequence "TODO(t)" "NEXT(n)" "ACTIVE(a)" "WAIT(w)" "|" "DONE(d)" "CANCELLED(c)")))
 
+(setq org-todo-keyword-faces
+  '(("TODO" . (:inherit (warning org-todo)))
+    ("NEXT" . (:inherit (font-lock-type-face org-todo)))
+    ("ACTIVE" . (:inherit (bold org-todo)))
+    ("WAIT" . (:inherit (shadow org-todo)))
+    ("DONE" . (:inherit (success org-todo)))
+    ("CANCELLED" . (:inherit (shadow org-done)))))
+
+(defun my/update-org-modern-faces ()
+  (setq org-modern-todo-faces
+    `(("TODO" :background ,(face-attribute 'warning :foreground)
+               :foreground ,(face-attribute 'default :background))
+      ("ACTIVE" :background ,(face-attribute 'error :foreground)
+                 :foreground ,(face-attribute 'default :background))
+      ("DONE" :background ,(face-attribute 'success :foreground)
+               :foreground ,(face-attribute 'default :background))
+      ("CANCELLED" :background ,(face-attribute 'shadow :foreground)
+                    :foreground ,(face-attribute 'default :background)))))
 
+(add-hook 'after-load-theme-hook #'my/update-org-modern-faces)
+(my/update-org-modern-faces)
 
 (defun org-set-effort-from-complexity ()
   (interactive)
@@ -1189,16 +1180,6 @@ and convert it to Org using the pandoc utility."
 
 (define-key org-mode-map (kbd "C-c e") 'org-set-effort-from-complexity)
 
-(setq org-agenda-skip-function-global
-  (lambda ()
-    (let ((subtree-end (save-excursion (org-end-of-subtree t))))
-      (if (and (not (org-entry-is-done-p))
-               (save-excursion
-                 (or (org-search-forward-unencoded (org-get-heading t t t t) subtree-end t)
-                     nil)))
-          subtree-end
-        nil))))
-
 (defun my/org-agenda-remove-tags ()
   (save-excursion
     (goto-char (point-min))
@@ -1384,8 +1365,7 @@ Works on the base filename (without extension), e.g. matches \"-task\", \":task:
   :ensure t
   :defer t
   :config
-  (setq denote-menu-title-column-width 40
-        denote-menu-show-file-type nil))
+  (setq denote-menu-title-column-width 60))
 
 (use-package denote-org
     :ensure t)
@@ -1445,6 +1425,10 @@ Works on the base filename (without extension), e.g. matches \"-task\", \":task:
               aliases tags category skip_archive has_code
               og_image og_description og_video_id))
 
+(use-package tmr
+  :ensure t
+  :straight (:host github :repo "protesilaos/tmr"))
+
 (use-package which-key
   :ensure t
   :defer t
@@ -1547,7 +1531,20 @@ Works on the base filename (without extension), e.g. matches \"-task\", \":task:
   :ensure t
   :mode ("README\\.md\\'" . gfm-mode)            
   :init 
-  (setq markdown-command "multimarkdown"))
+  (setq markdown-command "multimarkdown")
+  :config
+  (setq markdown-header-scaling t)
+  (setq markdown-hide-markup t)
+  (setq markdown-fontify-code-blocks-natively t)
+  
+  (custom-set-faces
+   '(markdown-header-face-1 ((t (:inherit markdown-header-face :height 1.8 :foreground "#A3BE8C" :weight extra-bold))))
+   '(markdown-header-face-2 ((t (:inherit markdown-header-face :height 1.4 :foreground "#EBCB8B" :weight extra-bold))))
+   '(markdown-header-face-3 ((t (:inherit markdown-header-face :height 1.2 :foreground "#D08770" :weight extra-bold))))
+   '(markdown-header-face-4 ((t (:inherit markdown-header-face :height 1.15 :foreground "#BF616A" :weight extra-bold))))
+   '(markdown-header-face-5 ((t (:inherit markdown-header-face :height 1.11 :foreground "#b48ead" :weight extra-bold))))
+   '(markdown-header-face-6 ((t (:inherit markdown-header-face :height 1.06 :foreground "#5e81ac" :weight extra-bold))))
+   '(markdown-header-delimiter-face ((t (:foreground "#616161" :height 0.9))))))
 
 ;; (use-package treesit-auto
 ;;   :ensure t
@@ -1832,6 +1829,18 @@ completion-category-overrides '((file (styles partial-completion))))) ;; Customi
   (olivetti-safe t)
 )
 
+(defun my-org-sidecar-left ()
+  "Org-Datei interaktiv als Sidecar links (25%)."
+  (interactive)
+  (let ((file (read-file-name "Org-Sidecar: " nil nil t)))
+    (display-buffer-in-side-window
+     (find-file-noselect file)
+     '((side . left)
+       (window-width . 0.25)
+       (slot . 0)))))
+
+(global-set-key (kbd "C-c o s") #'my-org-sidecar-left)
+
 ;; (use-package visual-fill-column
 ;;   :hook ((text-mode . visual-line-mode)        ;; Soft-Wrapping aktivieren
 ;;          (text-mode . visual-fill-column-mode)) ;; Das Zentrieren aktivieren
@@ -2133,6 +2142,10 @@ completion-category-overrides '((file (styles partial-completion))))) ;; Customi
 (use-package envrc
   :hook (after-init . envrc-global-mode))
 
+(add-hook 'org-agenda-mode-hook
+          (lambda ()
+            (add-hook 'auto-save-hook 'org-save-all-org-buffers nil t)
+            (auto-save-mode)))
 (use-package org-agenda
   :ensure nil
   :straight nil
@@ -2302,7 +2315,7 @@ completion-category-overrides '((file (styles partial-completion))))) ;; Customi
   (setq maple-modeline-height 25)
 
   (defun maple-modeline-to-header-line ()
-    (setq-default header-line-format mode-line-format)
+    (setq-default tab-line-format mode-line-format)
     (setq-default mode-line-format nil))
 
   (add-hook 'maple-modeline-mode-hook #'maple-modeline-to-header-line)
@@ -2369,7 +2382,7 @@ completion-category-overrides '((file (styles partial-completion))))) ;; Customi
 
 (defvar cashmere/font-height 180)
 
-(set-face-attribute 'default nil :family "MonoLisa" :weight 'medium :height cashmere/font-height)
+(set-face-attribute 'default nil :family "MonoLisa Nerd Font" :weight 'medium :height cashmere/font-height)
 (set-face-attribute 'fixed-pitch nil :family "RobotoMono Nerd Font" :weight 'regular)
 (set-face-attribute 'variable-pitch nil :family "Poppins" :weight 'regular :height 1.1)
 
@@ -3027,7 +3040,7 @@ completion-category-overrides '((file (styles partial-completion))))) ;; Customi
   "]t" 'tab-next
   "[t" 'tab-previous
   "P" 'consult-yank-from-kill-ring
-  "?" 'casual-avy-tmenu
+  ;; "?" 'casual-avy-tmenu
   "gcc" (lambda ()
           (interactive)
           (unless (use-region-p)
diff --git a/config.org b/config.org
index 74aecde..9435ca7 100644
--- a/config.org
+++ b/config.org
@@ -1046,14 +1046,6 @@ and convert it to Org using the pandoc utility."
            "" :immediate-finish t :jump-to-captured t))))
 #+end_src
 
-** org agenda settings gtd
-
-[[https://doc.norang.ca/org-mode.html#HandlingNotes][Org Mode - Organize Your Life In Plain Text!]]
-
-#+begin_src emacs-lisp
-(setq org-agenda-span 'day)
-#+end_src
-
 ** org-super-agenda
 
 #+begin_src emacs-lisp
@@ -1064,36 +1056,6 @@ and convert it to Org using the pandoc utility."
   (org-super-agenda-mode))
 #+end_src
 
-** org-reschedule
-
-#+begin_src emacs-lisp
-(use-package org-reschedule-by-rule
-  :straight (:host github :repo "Raemi/org-reschedule-by-rule")
-  :ensure t
-  :after org
-  :config
-  (setq org-reschedule-by-rule-rules
-    '(
-      (:name "Overdue to tomorrow"
-       :condition (lambda ()
-         (and (org-entry-get (point) "SCHEDULED")
-              (not (org-entry-is-done-p))
-              (< (org-time-string-to-seconds
-                   (org-entry-get (point) "SCHEDULED"))
-                 (org-time-string-to-seconds (format-time-string "<%Y-%m-%d>")))))
-       :action (lambda ()
-         (org-schedule nil (format-time-string "<%Y-%m-%d>" (time-add (current-time) (days-to-time 1))))))
-
-      (:name "Weekly reset to Monday"
-       :condition (lambda ()
-         (and (org-entry-get (point) "SCHEDULED")
-              (org-entry-is-done-p)
-              (member (org-entry-get (point) "TODO") '("ACTIVE" "NEXT"))))
-       :action (lambda ()
-         (org-schedule nil (format-time-string "<%Y-%m-%d>" (org-read-date nil nil "next Monday")))))
-      )))
-#+end_src
-
 ** org-ql
 
 #+begin_src emacs-lisp
@@ -1372,7 +1334,6 @@ and convert it to Org using the pandoc utility."
 (setq split-width-threshold 0)
 (setq split-height-threshold nil)
 
-
 (setq org-priority-faces
   '((?A . (:foreground "#ff6b6b" :weight bold))
     (?B . (:foreground "#ffd93d" :weight bold))
@@ -1397,7 +1358,27 @@ and convert it to Org using the pandoc utility."
 (setq org-todo-keywords
   '((sequence "TODO(t)" "NEXT(n)" "ACTIVE(a)" "WAIT(w)" "|" "DONE(d)" "CANCELLED(c)")))
 
+(setq org-todo-keyword-faces
+  '(("TODO" . (:inherit (warning org-todo)))
+    ("NEXT" . (:inherit (font-lock-type-face org-todo)))
+    ("ACTIVE" . (:inherit (bold org-todo)))
+    ("WAIT" . (:inherit (shadow org-todo)))
+    ("DONE" . (:inherit (success org-todo)))
+    ("CANCELLED" . (:inherit (shadow org-done)))))
+
+(defun my/update-org-modern-faces ()
+  (setq org-modern-todo-faces
+    `(("TODO" :background ,(face-attribute 'warning :foreground)
+               :foreground ,(face-attribute 'default :background))
+      ("ACTIVE" :background ,(face-attribute 'error :foreground)
+                 :foreground ,(face-attribute 'default :background))
+      ("DONE" :background ,(face-attribute 'success :foreground)
+               :foreground ,(face-attribute 'default :background))
+      ("CANCELLED" :background ,(face-attribute 'shadow :foreground)
+                    :foreground ,(face-attribute 'default :background)))))
 
+(add-hook 'after-load-theme-hook #'my/update-org-modern-faces)
+(my/update-org-modern-faces)
 
 (defun org-set-effort-from-complexity ()
   (interactive)
@@ -1411,16 +1392,6 @@ and convert it to Org using the pandoc utility."
 
 (define-key org-mode-map (kbd "C-c e") 'org-set-effort-from-complexity)
 
-(setq org-agenda-skip-function-global
-  (lambda ()
-    (let ((subtree-end (save-excursion (org-end-of-subtree t))))
-      (if (and (not (org-entry-is-done-p))
-               (save-excursion
-                 (or (org-search-forward-unencoded (org-get-heading t t t t) subtree-end t)
-                     nil)))
-          subtree-end
-        nil))))
-
 (defun my/org-agenda-remove-tags ()
   (save-excursion
     (goto-char (point-min))
@@ -1661,8 +1632,7 @@ Works on the base filename (without extension), e.g. matches \"-task\", \":task:
   :ensure t
   :defer t
   :config
-  (setq denote-menu-title-column-width 40
-        denote-menu-show-file-type nil))
+  (setq denote-menu-title-column-width 60))
 #+end_src
 
 
@@ -1754,6 +1724,14 @@ Some goodies for better integration with org files.
               og_image og_description og_video_id))
 #+end_src
 
+** tmr
+
+#+begin_src emacs-lisp
+(use-package tmr
+  :ensure t
+  :straight (:host github :repo "protesilaos/tmr"))
+#+end_src
+
 * which-key
 
 #+begin_src emacs-lisp
@@ -1879,7 +1857,20 @@ Some goodies for better integration with org files.
   :ensure t
   :mode ("README\\.md\\'" . gfm-mode)            
   :init 
-  (setq markdown-command "multimarkdown")) 
+  (setq markdown-command "multimarkdown")
+  :config
+  (setq markdown-header-scaling t)
+  (setq markdown-hide-markup t)
+  (setq markdown-fontify-code-blocks-natively t)
+  
+  (custom-set-faces
+   '(markdown-header-face-1 ((t (:inherit markdown-header-face :height 1.8 :foreground "#A3BE8C" :weight extra-bold))))
+   '(markdown-header-face-2 ((t (:inherit markdown-header-face :height 1.4 :foreground "#EBCB8B" :weight extra-bold))))
+   '(markdown-header-face-3 ((t (:inherit markdown-header-face :height 1.2 :foreground "#D08770" :weight extra-bold))))
+   '(markdown-header-face-4 ((t (:inherit markdown-header-face :height 1.15 :foreground "#BF616A" :weight extra-bold))))
+   '(markdown-header-face-5 ((t (:inherit markdown-header-face :height 1.11 :foreground "#b48ead" :weight extra-bold))))
+   '(markdown-header-face-6 ((t (:inherit markdown-header-face :height 1.06 :foreground "#5e81ac" :weight extra-bold))))
+   '(markdown-header-delimiter-face ((t (:foreground "#616161" :height 0.9))))))
 #+end_src
 
 * treesit-auto
@@ -2300,6 +2291,22 @@ ily <3.
 )
 #+end_src
 
+* shackle
+
+#+begin_src emacs-lisp
+(defun my-org-sidecar-left ()
+  "Org-Datei interaktiv als Sidecar links (25%)."
+  (interactive)
+  (let ((file (read-file-name "Org-Sidecar: " nil nil t)))
+    (display-buffer-in-side-window
+     (find-file-noselect file)
+     '((side . left)
+       (window-width . 0.25)
+       (slot . 0)))))
+
+(global-set-key (kbd "C-c o s") #'my-org-sidecar-left)
+#+end_src
+
 * visual-fill-column
 
 #+begin_src emacs-lisp
@@ -2688,6 +2695,10 @@ ily <3.
 * org agenda
 
 #+begin_src emacs-lisp
+(add-hook 'org-agenda-mode-hook
+          (lambda ()
+            (add-hook 'auto-save-hook 'org-save-all-org-buffers nil t)
+            (auto-save-mode)))
 (use-package org-agenda
   :ensure nil
   :straight nil
@@ -3181,7 +3192,7 @@ ily <3.
   (setq maple-modeline-height 25)
 
   (defun maple-modeline-to-header-line ()
-    (setq-default header-line-format mode-line-format)
+    (setq-default tab-line-format mode-line-format)
     (setq-default mode-line-format nil))
 
   (add-hook 'maple-modeline-mode-hook #'maple-modeline-to-header-line)
@@ -3258,7 +3269,7 @@ ily <3.
 
 (defvar cashmere/font-height 180)
 
-(set-face-attribute 'default nil :family "MonoLisa" :weight 'medium :height cashmere/font-height)
+(set-face-attribute 'default nil :family "MonoLisa Nerd Font" :weight 'medium :height cashmere/font-height)
 (set-face-attribute 'fixed-pitch nil :family "RobotoMono Nerd Font" :weight 'regular)
 (set-face-attribute 'variable-pitch nil :family "Poppins" :weight 'regular :height 1.1)
 
@@ -4013,7 +4024,7 @@ ily <3.
   "]t" 'tab-next
   "[t" 'tab-previous
   "P" 'consult-yank-from-kill-ring
-  "?" 'casual-avy-tmenu
+  ;; "?" 'casual-avy-tmenu
   "gcc" (lambda ()
           (interactive)
           (unless (use-region-p)
diff --git a/elfeed/index b/elfeed/index
new file mode 100644
index 0000000..c74ac53
--- /dev/null
+++ b/elfeed/index
@@ -0,0 +1,7 @@
+;;; Elfeed Database Index (version 4)
+
+;; Dummy index for backwards compatablity:
+(:version "0.0.3" :feeds #s(hash-table test equal) :entries #s(hash-table test equal) :index [cl-struct-avl-tree- [nil nil nil 0] elfeed-db-compare])
+
+;; Real index:
+(:version 4 :feeds #s(hash-table test equal) :entries #s(hash-table test equal) :index #s(avl-tree- [nil nil nil 0] elfeed-db-compare))
\ No newline at end of file