1 files changed, 25 insertions, 12 deletions
diff --git a/.emacs.d/rul-lisp/packages/rul-org.el b/.emacs.d/rul-lisp/packages/rul-org.el
index ed95a3a..409517e 100644
--- a/.emacs.d/rul-lisp/packages/rul-org.el
+++ b/.emacs.d/rul-lisp/packages/rul-org.el
@@ -1,14 +1,10 @@
-;; Debian packages: elpa-org
-;; Elpa packages: org-modern
+;;; rul-org.el --- Org configuration
 (require 'org)
 (require 'org-capture)
 (require 'org-protocol)
 (require 'org-habit)
 
-(require 'rul-config-org)
-
 (require 'rul-org-agenda)
-(require 'rul-org-journal)
 
 (setq org-attach-use-inheritance t)
 (setq org-cycle-separator-lines 0)
@@ -17,10 +13,24 @@
 (setq org-edit-src-content-indentation 0)
 
 (use-package org-modern :ensure t)
-(use-package org-pomodoro :ensure t)
+(use-package org-pomodoro
+  :ensure t
+  :config
+  (defun rul/disable-notifications ()
+    "Disable GNOME notifications."
+    (shell-command "gsettings set org.gnome.desktop.notifications show-banners false"))
+
+  (defun rul/enable-notifications ()
+    "Enable GNOME notifications."
+    (shell-command "gsettings set org.gnome.desktop.notifications show-banners true"))
 
-(add-hook 'org-mode-hook 'turn-off-auto-fill)
-(add-hook 'auto-save-hook 'org-save-all-org-buffers)
+  ;; Add hooks for Pomodoro start and finish
+  (add-hook 'org-pomodoro-started-hook #'rul/disable-notifications)
+  (add-hook 'org-pomodoro-finished-hook #'rul/enable-notifications)
+  (add-hook 'org-pomodoro-killed-hook #'rul/enable-notifications))
+
+;; (add-hook 'org-mode-hook 'turn-off-auto-fill)
+;; (add-hook 'auto-save-hook 'org-save-all-org-buffers)
 (add-hook 'org-mode-hook 'visual-line-mode)
 
 (use-package org-download
@@ -41,6 +51,10 @@
 (global-set-key (kbd "C-c c") #'org-capture)
 (global-set-key (kbd "C-c s") #'org-schedule)
 
+(global-set-key (kbd "<f9>") 'bh/punch-in)
+(global-set-key (kbd "<f10>") 'bh/punch-out)
+(global-set-key (kbd "<f12>") 'org-agenda)
+
 ;; ORG STATES ;;
 (setq org-todo-keywords
       (quote ((sequence "TODO(t)" "MAYBE(m)" "NEXT(n)" "|" "DONE(d)")
@@ -61,9 +75,9 @@
 (setq org-log-done (quote time))
 (setq org-log-redeadline (quote time))
 (setq org-log-reschedule (quote time))
+(setq org-log-into-drawer t)
 
 ;; CAPTURE ;;
-(setq org-default-notes-file org-refile-path)
 (setq org-capture-templates
       (quote
        (
@@ -86,13 +100,12 @@
 
         ("L" "Web Link" entry
          (file+headline org-refile-path "Read later")
-         "* %?[[%:link][%:description]] \"\")\n %:initial\n \nCaptured On: %U"
+         "* %?[[%:link][%:description]]\n %:initial\n \nCaptured On: %U"
          )
 
         ("l" "Web Link with Selection" entry
          (file+headline org-refile-path "Read later")
-         "* [[%:link][%:description]] \n %:initial\n \nCaptured On: %U")
-
+         "* [[%:link][%:description]]\n %:initial\n \nCaptured On: %U")
         )))
 
 ;; REFILE ;;