diff --git a/bundle/bundle--holidays.el b/bundle/bundle--holidays.el deleted file mode 100644 index bca8dc09..00000000 --- a/bundle/bundle--holidays.el +++ /dev/null @@ -1,38 +0,0 @@ -(setq holiday-oriental-holidays - '(())) - -(setq holiday-islamic-holidays - '(())) - -(setq holiday-bahai-holidays - '(())) - -(setq holiday-hebrew-holidays - '(())) - -(setq holiday-general-holidays - '((holiday-fixed 1 1 "Neujahr") - (holiday-fixed 5 1 "1. Mai") - (holiday-fixed 10 3 "Tag der Deutschen Einheit"))) - -(setq holiday-christian-holidays - '((holiday-float 12 0 -4 "1. Advent" 24) - (holiday-float 12 0 -3 "2. Advent" 24) - (holiday-float 12 0 -2 "3. Advent" 24) - (holiday-float 12 0 -1 "4. Advent" 24) - (holiday-fixed 12 25 "1. Weihnachtstag") - (holiday-fixed 12 26 "2. Weihnachtstag") - (holiday-fixed 1 6 "Heilige Drei Könige") - (holiday-easter-etc -48 "Rosenmontag") - ;; (holiday-easter-etc -3 "Gründonnerstag") - (holiday-easter-etc -2 "Karfreitag") - (holiday-easter-etc 0 "Ostersonntag") - (holiday-easter-etc +1 "Ostermontag") - (holiday-easter-etc +39 "Christi Himmelfahrt") - (holiday-easter-etc +49 "Pfingstsonntag") - (holiday-easter-etc +50 "Pfingstmontag") - (holiday-easter-etc +60 "Fronleichnam") - (holiday-fixed 8 15 "Mariae Himmelfahrt") - (holiday-fixed 11 1 "Allerheiligen") - ;; (holiday-float 11 3 1 "Buss- und Bettag" 16) - (holiday-float 11 0 1 "Totensonntag" 20))) diff --git a/init.el b/init.el index 9a59af06..c10630fc 100755 --- a/init.el +++ b/init.el @@ -83,8 +83,8 @@ ;; ))) ;; Disable line numbers in modes -(dolist (mode '(org-mode-hook term-mode-hook shell-mode-hookeshell-mode-hook)) - (add-hook mode (lambda () (display-line-numbers-mode 0)))) +;; (dolist (mode '(org-mode-hook term-mode-hook shell-mode-hook eshell-mode-hook)) +;; (add-hook mode (lambda () (display-line-numbers-mode 0)))) (add-hook 'after-save-hook 'executable-make-buffer-file-executable-if-script-p) @@ -133,7 +133,47 @@ (setenv "PYTHONIOENCODING" "UTF-8") ;;; -(load "bundle--holidays") +;;; bundle--holidays +(setq holiday-oriental-holidays + '(())) + +(setq holiday-islamic-holidays + '(())) + +(setq holiday-bahai-holidays + '(())) + +(setq holiday-hebrew-holidays + '(())) + +(setq holiday-general-holidays + '((holiday-fixed 1 1 "Neujahr") + (holiday-fixed 5 1 "1. Mai") + (holiday-fixed 10 3 "Tag der Deutschen Einheit"))) + +(setq holiday-christian-holidays + '((holiday-float 12 0 -4 "1. Advent" 24) + (holiday-float 12 0 -3 "2. Advent" 24) + (holiday-float 12 0 -2 "3. Advent" 24) + (holiday-float 12 0 -1 "4. Advent" 24) + (holiday-fixed 12 25 "1. Weihnachtstag") + (holiday-fixed 12 26 "2. Weihnachtstag") + (holiday-fixed 1 6 "Heilige Drei Könige") + (holiday-easter-etc -48 "Rosenmontag") + ;; (holiday-easter-etc -3 "Gründonnerstag") + (holiday-easter-etc -2 "Karfreitag") + (holiday-easter-etc 0 "Ostersonntag") + (holiday-easter-etc +1 "Ostermontag") + (holiday-easter-etc +39 "Christi Himmelfahrt") + (holiday-easter-etc +49 "Pfingstsonntag") + (holiday-easter-etc +50 "Pfingstmontag") + (holiday-easter-etc +60 "Fronleichnam") + (holiday-fixed 8 15 "Mariae Himmelfahrt") + (holiday-fixed 11 1 "Allerheiligen") + ;; (holiday-float 11 3 1 "Buss- und Bettag" 16) + (holiday-float 11 0 1 "Totensonntag" 20))) +;;; + (load "bundle--server") (load "bundle--customfile") (load "bundle--package")