From 6629c85f024bb5ccd53643d9ac34e8e304367231 Mon Sep 17 00:00:00 2001
From: fz0x1 <fz0x1+gpg@posteo.net>
Date: Thu, 28 Nov 2024 14:54:14 +0100
Subject: [PATCH] 20241128

---
 global/.emacs.d/init.el | 49 +++++++++++++++++++++++++++--------------
 global/.tmux.conf       |  1 +
 2 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/global/.emacs.d/init.el b/global/.emacs.d/init.el
index d82d814..de9ad85 100644
--- a/global/.emacs.d/init.el
+++ b/global/.emacs.d/init.el
@@ -46,6 +46,16 @@
   :config
   (evil-mode 1))
 
+(use-package helm
+  :ensure t
+  :config
+  (helm-mode 1))
+
+(use-package helm-org-rifle
+  :ensure t
+  :init
+  (global-set-key (kbd "C-c r") 'helm-org-rifle-agenda-files))
+
 (setq aw-dispatch-always t)
 
 (setq use-package-always-ensure t)
@@ -74,14 +84,16 @@
 ;; Shortcuts for storing links, viewing the agenda, and starting a capture
 (define-key global-map "\C-cl" 'org-store-link)
 (define-key global-map "\C-ca" 'org-agenda)
-(define-key global-map "\C-cc" 'org-capture)
-(define-key global-map "\C-ci" 'org-id-get-create)
-;; (define-key global-map "\C-ci" 'org-id-copy)
-(define-key global-map "\C-cp" 'org-set-property)
+(define-key global-map (kbd "C-c c") 'org-capture)
+(define-key org-mode-map (kbd "C-c i") 'org-id-get-create)
+(define-key org-mode-map (kbd "C-c p") 'org-set-property)
 
 (global-set-key (kbd "C-c n") (lambda () (interactive) (find-file "~/org/notes.org")))
 (global-set-key (kbd "C-c w") (lambda () (interactive) (find-file "~/org/work-log.org")))
 
+  (define-key helm-map (kbd "C-M-n") 'helm-next-source)
+(define-key helm-map (kbd "C-M-p") 'helm-previous-source)
+
 ;; When you want to change the level of an org item, use SMR
 (define-key org-mode-map (kbd "C-c C-g C-r") 'org-shiftmetaright)
 
@@ -107,7 +119,7 @@
 (define-key evil-normal-state-map (kbd "TAB") 'org-cycle) ;; return the standard functionality for TAB
 
 (add-hook 'org-mode-hook (lambda () (org-load-modules-maybe t)))
-(setq org-id-link-to-org-use-id t)
+;; (setq org-id-link-to-org-use-id t)
 
 ;; autosave org-mode buffers
 (setq auto-save-timeout 20)
@@ -156,17 +168,17 @@
 
         ("r" "Grocery list"
          entry (file+headline "~/org/grocery.org" "Grocery list")
-         "* NEED2BUY [#B] %?\n:Created: %T\n "
+         "* NEED2BUY [#B] %?\n:PROPERTIES:\n:Created: %T\n:END:\n "
          :empty-lines 0)
 
         ("g" "General To-Do"
          entry (file+headline "~/org/todos.org" "General Tasks")
-         "* TODO [#B] %?\n:Created: %T\n "
+         "* TODO [#B] %?\n:PROPERTIES:\n:Created: %T\n:END:\n "
          :empty-lines 0)
 
         ("m" "Meeting"
          entry (file+datetree "~/org/meetings.org")
-         "* %? :meeting:%^g \n:Created: %T\n** Notes\n** Action Items\n*** TODO [#A] "
+         "* %? :meeting:%^g \n:PROPERTIES:\n:Created: %T\n:END:\n** Notes\n** Action Items\n*** TODO [#A] "
          :tree-type week
          :clock-in t
          :clock-resume t
@@ -174,7 +186,7 @@
 
         ("c" "Code To-Do"
          entry (file+headline "~/org/todos.org" "Code Related Tasks")
-         "* TODO [#B] %?\n:Created: %T\n%i\nProposed Solution:\n"
+         "* TODO [#B] %?\n:PROPERTIES:\n:Created: %T\n:END:\n%i\nProposed Solution:\n"
          :empty-lines 0)
 
 
@@ -185,7 +197,7 @@
 
         ("L" "Unselected web capture"
          entry (file "~/org/web-links.org")
-         "* %? [[%:link][%(transform-square-brackets-to-round-ones \"%:description\")]]\n"
+         "** %(transform-square-brackets-to-round-ones \"%:description\")%?\n:PROPERTIES:\n:Created: %T\n:END:\n- %:link\n"
          :empty-lines 1)))
 
 (setq org-todo-keywords
@@ -200,8 +212,7 @@
         ("VERIFYING" . (:foreground "DarkOrange" :weight bold))
         ("BLOCKED" . (:foreground "Red" :weight bold))
         ("DONE" . (:foreground "LimeGreen" :weight bold))
-        ("OBE" . (:foreground "LimeGreen" :weight bold))
-        ("WONT-DO" . (:foreground "LimeGreen" :weight bold))
+        ("NEED2BUY" . (:foreground "Red" :weight bold))
         ))
 
 
@@ -234,6 +245,7 @@
                       ("friends" . ?E)
                       ("hobby" . ?B)
                       ("research" . ?G)
+                      ("article" . ?I)
                       (:endgroup)
 
                       ;; Special tags
@@ -251,6 +263,9 @@
                       ("devops")
                       ("pet")
                       ("accomplishment")
+                      ("music")
+                      ("youtube")
+                      ("trash")
                       ))
 
 
@@ -358,11 +373,6 @@
                               :todo "IN-PROGRESS"
                               :order 1
                               )
-                       ;; Filter where TODO state is PLANNING
-                       (:name "Planning Next Steps"
-                              :todo "PLANNING"
-                              :order 2
-                              )
                        ;; Filter where TODO state is BLOCKED or where the tag is obstacle
                        (:name "Problems & Blockers"
                               :todo "BLOCKED"
@@ -403,6 +413,11 @@
                               :todo "VERIFYING"
                               :order 10
                               )
+                       ;; Filter where TODO state is PLANNING
+                       (:name "Planning Next Steps"
+                              :todo "PLANNING"
+                              :order 11
+                              )
                        )
                      )
                     )
diff --git a/global/.tmux.conf b/global/.tmux.conf
index 6bd2203..403dbc5 100755
--- a/global/.tmux.conf
+++ b/global/.tmux.conf
@@ -62,6 +62,7 @@ set -g @plugin 'tmux-plugins/tmux-sensible'
 # set -g @plugin 'tmux-plugins/tmux-continuum'
 set -g @plugin 'MunifTanjim/tmux-mode-indicator'
 set -g @plugin 'christoomey/vim-tmux-navigator'
+set -g @plugin 'schasse/tmux-jump'
 
 run '~/.tmux/plugins/tpm/tpm'