Switch back to yearly journal files, GPG encrypted again

Start moving timesheet tracking into own files so that clock report
can sum up per WON, ongoing task

init.el

@@ -540,6 +540,7 @@
   (org-fontify-emphasized-text t)
   (org-fontify-quote-and-verse-blocks t)
   (org-tags-column 0)
+  (org-use-property-inheritance '("WON"))
   (org-enforce-todo-dependencies t)
   (org-enforce-todo-checkbox-dependencies t)
   (org-yank-folded-subtrees nil)
@@ -669,9 +670,10 @@
   :custom
   (org-journal-dir (expand-file-name "journal" org-directory))
   (org-journal-file-header "#+category: Journal")
-  (org-journal-file-type 'monthly)
-  (org-journal-file-format "%Y-%m_%B.org")
+  (org-journal-file-type 'yearly)
+  (org-journal-file-format "%Y.org")
   (org-journal-date-format "%A, %F")
+  (org-journal-encrypt-journal t)
   (org-journal-carryover-items nil))
 
 (use-package org-clock
@@ -707,15 +709,24 @@
   (org-agenda-include-deadlines t)
   (org-agenda-todo-ignore-scheduled 'future)
   (org-agenda-todo-ignore-deadlines 'far)
-  (org-agenda-clockreport-parameter-plist '(:maxlevel 6 :emphasize t :stepskip0 t :fileskip0 t :properties ("WON")))
+  (org-agenda-clockreport-parameter-plist '( :maxlevel 6
+                                             :step day
+                                             :stepskip0 t
+                                             :fileskip0 t
+                                             :emphasize t
+                                             :indent t
+                                             :filetitle t
+                                             :properties ("WON")
+                                             :inherit-props t))
   (org-agenda-start-with-log-mode t)
-  (org-agenda-start-with-clockreport-mode nil)
+  (org-agenda-start-with-clockreport-mode t)
   (org-agenda-prefix-format '((agenda . " %-12:c%?-12t% s")
                               (todo . " %-12:c")
                               (tags . " %-12:c")
                               (search . " %-12:c")))
   (org-agenda-file-regexp "\\`[^.].*\\.org\\\(\\.gpg\\\)?\\'")
-  (org-agenda-files (list (expand-file-name org-directory)))
+  (org-agenda-files (list (expand-file-name org-directory)
+                          (expand-file-name "timesheets" org-directory)))
   :config
   (require 'appt)
   (require 'khalel)