Add atwork variable

master
trémeur 3 years ago
parent 7e9c4e4873
commit 21f49b4738

@ -23,6 +23,11 @@
(string-equal system-type "darwin") (string-equal system-type "darwin")
) )
(defun atwork ()
"Return true if at work"
(string-equal user-login-name "3055822")
)
;; it's not 1986 ;; it's not 1986
(prefer-coding-system 'utf-8) (prefer-coding-system 'utf-8)
@ -298,7 +303,7 @@
cfw:display-calendar-holidays nil cfw:display-calendar-holidays nil
calendar-week-start-day 1)) calendar-week-start-day 1))
(when (islin) (unless (atwork)
(defun org-journal-file-header-func (time) (defun org-journal-file-header-func (time)
(concat "<" (format-time-string "%Y-%m-%d %a") ">\n\n")) (concat "<" (format-time-string "%Y-%m-%d %a") ">\n\n"))
(use-package org-journal (use-package org-journal
@ -334,12 +339,14 @@
(setq calendar-week-start-day 1) (setq calendar-week-start-day 1)
(setq org-agenda-start-on-weekday nil) (setq org-agenda-start-on-weekday nil)
(when (islin) (unless (atwork)
(setq org-agenda-files (list "~/Documents/drive/org/calendar" (setq org-agenda-files (list "~/Documents/drive/org/calendar"
"~/Documents/drive/org/period.org" "~/Documents/drive/org/period.org"
"~/Documents/drive/org/habit.org"))) "~/Documents/drive/org/habit.org")))
(when (iswin) (when (atwork)
(setq org-agenda-files '("~/Documents/drive/org/calendar"))) (setq org-agenda-files (list "~/Documents/drive/org/calendar"
"~/Documents/drive/org/period.org"
"~/Documents/drive/org/acwri.org")))
(setq org-agenda-prefix-format (setq org-agenda-prefix-format
'((todo . "%-2c %b") '((todo . "%-2c %b")
(tags . "%-2c %b") (tags . "%-2c %b")
@ -472,16 +479,7 @@
(setq initial-major-mode 'org-mode) (setq initial-major-mode 'org-mode)
(unless (iswin) (setq initial-scratch-message
(setq initial-scratch-message "\ (concat "# emacs " (number-to-string emacs-major-version) " on " (symbol-name system-type) "\n\n"))
#
"))
(when (iswin)
(setq initial-scratch-message "\
# obma emacs war microsoft beistry
"))
(org-reload) (org-reload)

Loading…
Cancel
Save