Restyle the agenda

global.org

@@ -1648,11 +1648,6 @@
                  (year (nth 2 date))
                  (iso-week (org-days-to-iso-week
                             (calendar-absolute-from-gregorian date)))
-                 ;; (weekyear (cond ((and (= month 1) (>= iso-week 52))
-                 ;;        	  (1- year))
-                 ;;        	 ((and (= month 12) (<= iso-week 1))
-                 ;;        	  (1+ year))
-                 ;;        	 (t year)))
                  (weekstring (format " W%02d" iso-week)
                              ))
             (format "%s%s - %4d·%02d·%02d"
@@ -1682,29 +1677,16 @@
                                    (t year)))
                    (weekstring (format " W%02d" iso-week)))
 
-              ;; (format (concat "\n"
-              ;;                 "%9s %s %4d%s\n"
-              ;;                 "%9s \n"
-              ;;                 "%9s %-10s\n"
-              ;;                 "%9s \n"
-              ;;                 "%9s %s\n")
-              ;;         (figlet-num day 0) monthname year weekstring
-              ;;         (figlet-num day 1)
-              ;;         (figlet-num day 2) dayname
-              ;;         (figlet-num day 3)
-              ;;         (figlet-num day 4) (sunrise-sunset))
-
               (let ((solar-info (solar-sunrise-sunset-string-list (calendar-current-date)))
-                    (spacer "  ")
-                    )
+                    (spacer "   "))
                 (concat "\n"
                  (format " %4d·%02d " year month) "\n"
                  (format "%9s" (figlet-num day 0 2)) spacer (format "%s%s" dayname weekstring) "\n"
                  (format "%9s" (figlet-num day 1 2)) spacer (car solar-info) "\n"
                  (format "%9s" (figlet-num day 2 2)) spacer (cadr solar-info) "\n"
                  (format "%9s" (figlet-num day 3 2)) spacer (caddr solar-info) "\n"
-                 (format "%9s" (figlet-num day 4 2)) "\n"
-                 )))))
+                 (format "%9s" (figlet-num day 4 2)) "\n")))))
+
         (require 'solar)
         (defun solar-sunrise-sunset-string-list (date &optional nolocation)
           "String of *local* times of sunrise, sunset, and daylight on Gregorian DATE.
@@ -1720,8 +1702,6 @@
              (format  "%s hours daylight"
                       (nth 2 l)))))
 
-        (solar-sunrise-sunset-string-list (calendar-current-date))
-
         (defun left-right-align (s1 s2)
           (concat s1 (make-string (- (window-body-width) (length s1) (length s2)) ?\  ) s2 "\n"))
 
@@ -1731,10 +1711,10 @@
 
         (setq org-agenda-format-date #'org-agenda-format-date-figlet)
         (setq org-agenda-prefix-format
-              '((agenda . " %i %6c %s %?-12t")
-                (todo . " %i %6c · ")
-                (tags . " %i %6c · ")
-                (search . " %i %6c · ")))
+              '((agenda . " %i %7c %s %?-12t")
+                (todo .   " %i %7c · ")
+                (tags .   " %i %7c · ")
+                (search . " %i %7c · ")))
 
         (advice-add 'org-agenda-get-scheduled :around
                     (lambda (orig-fun &rest args)