fix merge conflict

3 files changed, 22 insertions, 2 deletions

diff --git a/bard-emacs-modules/bard-emacs-emms.el b/bard-emacs-modules/bard-emacs-emms.el
index cb668ad..1b163a5 100644
--- a/bard-emacs-modules/bard-emacs-emms.el
+++ b/bard-emacs-modules/bard-emacs-emms.el
@@ -3,6 +3,7 @@
 ;; |------------------------------------|
 
 (require 'emms)
+(require 'emms-setup)
 (require 'emms-mpris)
 
 (emms-all)
diff --git a/bard-emacs-modules/bard-emacs-org.el b/bard-emacs-modules/bard-emacs-org.el
index a905897..36278b4 100644
--- a/bard-emacs-modules/bard-emacs-org.el
+++ b/bard-emacs-modules/bard-emacs-org.el
@@ -23,6 +23,13 @@
   (setq org-format-latex-options (plist-put org-format-latex-options :scale 1.6))
   )
 
+;; Calendar
+
+(with-eval-after-load 'calendar-mode
+  (setq calendar-holidays (append calendar-holidays russian-holidays))
+  (add-hook 'calendar-today-visible-hook 'calendar-mark-today)
+  (add-hook 'calendar-today-visible-hook 'calendar-mark-holidays))
+
 ;; Org todo keywords - changed to using hl-todo faces fixed by modus/ef themes
 (setq org-todo-keywords '((sequence "TODO(t)" "WAIT(w)" "NEXT (n)" "|" "DONE(d)" "KILLED(k)")))
 (add-hook 'org-mode-hook 'hl-todo-mode)
diff --git a/bard-emacs-modules/bard-emacs-package.el b/bard-emacs-modules/bard-emacs-package.el
index 3a32a30..80e80b1 100644
--- a/bard-emacs-modules/bard-emacs-package.el
+++ b/bard-emacs-modules/bard-emacs-package.el
@@ -59,7 +59,8 @@ The exact color values are taken from the active Ef theme."
   (add-hook 'ef-themes-post-load-hook #'bard/ef-themes-hl-todo-faces)
   (define-key global-map (kbd "M-<f5>") #'ef-themes-toggle)
   (setq ef-themes-to-toggle '(ef-winter ef-frost))
-  (load-theme 'ef-winter t))
+  ;; (load-theme 'ef-winter)
+  )
 
 (use-package modus-themes
   :ensure t
@@ -236,6 +237,17 @@ The exact color values are taken from the active Ef theme."
 (use-package org-cliplink
   :ensure t)
 
+;; (use-package org-alert
+;;   :ensure t
+;;   :custom (alert-default-style 'notifications)
+;;   :config
+;;   (setq org-alert-interval 300
+;; 	org-alert-notifications-title "Org Reminder"))
+
+;; (use-package org-notifications
+;;   :ensure t
+;;   :config)
+
 (use-package hl-todo
   :ensure t
   :init
@@ -244,7 +256,7 @@ The exact color values are taken from the active Ef theme."
 (use-package pdf-tools
   :ensure t)
 
-(use-package toc-org
+(use-package russian-holidays
   :ensure t)
 
 (use-package expand-region