Merge branch 'main' of gitlab.com:marcuskammer/emacs.d into main

bundle/bundle--customfile.el

@@ -10,6 +10,8 @@
         sbcl-core (expand-file-name "C:\\Program Files\\Steel Bank Common Lisp\\2.0.0\\sbcl.core")
 	inferior-lisp-program "sbcl"
 	slime-lisp-implementations `((sbcl (,sbcl-exe "--core" ,sbcl-core))))
+  (setq plantuml-jar-path "c:/Users/Marcus.Kammer/AppData/Local/Programs/plantuml/plantuml.jar")
+  (setq plantuml-default-exec-mode 'jar)
   (when (string= (system-name) "EVG02667NB")
     (add-to-list 'Info-default-directory-list "~/Info")
     (setq custom-file "~/.emacs.d/bundle/custom_win32_EVG02667NB.el"))

bundle/bundle--defaults.el

@@ -0,0 +1,30 @@
+(horizontal-scroll-bar-mode 0)
+(menu-bar-mode 0)
+(scroll-bar-mode 0)
+(tool-bar-mode 0)
+(show-paren-mode 1)
+(global-hl-line-mode 1)
+
+(put 'narrow-to-region 'disabled nil)
+(put 'narrow-to-page 'disabled nil)
+
+(setq-default indent-tabs-mode nil
+              inhibit-startup-buffer-menu t
+              inhibit-startup-screen t
+              ispell-program-name "aspell"
+              line-spacing nil
+              calendar-christian-all-holidays-flag t
+              calendar-date-style (quote iso)
+              calendar-view-diary-initially-flag t
+              calendar-week-start-day 1
+              make-backup-files nil
+              browse-url-browser-function (quote eww-browse-url)
+              indent-tabs-mode nil
+              inhibit-startup-buffer-menu t
+              inhibit-startup-screen t)
+
+
+(setq tab-width 4
+      sentence-end-double-space nil
+      next-line-add-newlines t
+      require-final-newline 't)

bundle/bundle--hooks.el

@@ -0,0 +1,18 @@
+(add-hook 'diary-display-hook 'fancy-diary-display)
+(add-hook 'today-visible-calendar-hook 'calendar-mark-today)
+(add-hook 'write-file-hooks 'delete-trailing-whitespace)
+(add-hook 'diary-list-entries-hook 'diary-include-other-diary-files)
+(add-hook 'diary-mark-entries-hook 'diary-mark-included-diary-files)
+(defun me/org-mode ()
+  "My custom configuration for 'org-mode'."
+  ;(olivetti-mode)
+  (require 'olivetti)
+  (olivetti-set-width 82))
+(add-hook 'nov-mode-hook 'me/org-mode)
+(add-hook 'org-mode-hook 'turn-on-auto-fill)
+(add-hook 'rst-mode-hook 'turn-on-orgstruct)
+(add-hook 'newsticker-mode-hook 'imenu-add-menubar-index)
+(if (display-graphic-p)
+    (add-hook 'after-init-hook (lambda ()
+                                 (org-agenda-list)
+                                 (me/split-windows-horizontal))))

bundle/bundle--lists.el

@@ -0,0 +1,7 @@
+(add-to-list 'auto-mode-alist '("\\.tmpl\\'" . web-mode))
+(add-to-list 'auto-mode-alist '("\\.lisp$" . lisp-mode))
+(add-to-list 'auto-mode-alist '("\\.lsp$" . lisp-mode))
+(add-to-list 'auto-mode-alist '("\\.cl$" . lisp-mode))
+(add-to-list 'auto-mode-alist '("\\.epub\\'" . nov-mode))
+(add-to-list 'auto-mode-alist '("\\.[Cc][Ss][Vv]\\'" . csv-mode))
+(add-to-list 'slime-contribs 'slime-autodoc)

bundle/bundle--package.el

@@ -106,6 +106,7 @@ There are two things you can do about this warning:
         org-log-done (quote time)
         org-startup-folded t
         org-startup-truncated nil
+        org-global-properties (quote (("EFFORT_ALL" . "1:00 2:00 3:00 5:00 8:00 13:00")))
         org-todo-keywords (quote ((sequence "OPEN" "TODO" "DOING" "|" "DONE")))
         org-export-backends (quote (ascii beamer html icalendar latex md))
         org-duration-format (quote h:mm)
@@ -118,7 +119,7 @@ There are two things you can do about this warning:
                              ("dot" . fundamental)
                              ("screen" . shell-script)
                              ("shell" . sh)
-                             ("plantuml" . fundamental)))
+                             ("plantuml" . plantuml)))
         org-use-property-inheritance nil
         org-export-with-sub-superscripts nil
         org-capture-templates (quote

bundle/custom_win32_EVG02667NB.el

@@ -7,11 +7,6 @@
  '(ansi-color-faces-vector
    [default default default italic underline success warning error])
  '(backup-directory-alist (quote (("." . "~/.backup_filez"))))
- '(browse-url-browser-function (quote eww-browse-url))
- '(calendar-christian-all-holidays-flag t)
- '(calendar-date-style (quote iso))
- '(calendar-view-diary-initially-flag t)
- '(calendar-week-start-day 1)
  '(custom-enabled-themes (quote (nord)))
  '(custom-safe-themes
    (quote
@@ -33,18 +28,11 @@
     (elpy-module-company elpy-module-eldoc elpy-module-flymake elpy-module-pyvenv elpy-module-yasnippet elpy-module-sane-defaults)))
  '(elpy-test-runner (quote elpy-test-pytest-runner))
  '(geiser-default-implementation (quote racket))
- '(global-hl-line-mode t)
- '(horizontal-scroll-bar-mode nil)
- '(indent-tabs-mode nil)
- '(inhibit-startup-buffer-menu t)
- '(inhibit-startup-screen t)
  '(initial-buffer-choice
    "d:/UserData/marcus.kammer/OneDrive - Siemens AG/documents/Journal/notes.org")
  '(initial-frame-alist nil)
- '(ispell-program-name "aspell")
- '(line-spacing nil)
  '(ls-lisp-dirs-first t)
- '(menu-bar-mode nil)
+ '(make-backup-files nil)
  '(mode-line-format
    (quote
     ("-" mode-line-mule-info mode-line-modified mode-line-frame-identification mode-line-buffer-identification " " mode-line-position mode-line-modes
@@ -92,15 +80,14 @@
     (ol-bbdb ol-bibtex ol-docview ol-eww ol-gnus ol-info ol-irc ol-mhe ol-rmail org-tempo ol-w3m)))
  '(org-plantuml-jar-path
    "c:/Users/Marcus.Kammer/AppData/Local/Programs/plantuml/plantuml.jar")
+ '(org-refile-targets (quote ((nil :maxlevel . 3))))
  '(package-selected-packages
    (quote
-    (ox-reveal counsel all-the-icons-dired all-the-icons-gnus all-the-icons-ibuffer all-the-icons-ivy all-the-icons-ivy-rich helpful nov gnu-elpa-keyring-update slime-company elpy eglot color-theme-sanityinc-tomorrow ein projectile markdown-preview-mode request rust-mode sphinx-frontend sphinx-mode racket-mode geiser slime web-mode js2-mode markdown-mode yaml-mode olivetti use-package nord-theme nordless-theme org toc-org ace-window htmlize ivy magit)))
+    (plantuml-mode ox-reveal counsel all-the-icons-dired all-the-icons-gnus all-the-icons-ibuffer all-the-icons-ivy all-the-icons-ivy-rich helpful nov gnu-elpa-keyring-update slime-company elpy eglot color-theme-sanityinc-tomorrow ein projectile markdown-preview-mode request rust-mode sphinx-frontend sphinx-mode racket-mode geiser slime web-mode js2-mode markdown-mode yaml-mode olivetti use-package nord-theme nordless-theme org toc-org ace-window htmlize ivy magit)))
  '(projectile-completion-system (quote ivy))
  '(python-indent-guess-indent-offset nil)
  '(python-shell-interpreter "python")
- '(ring-bell-function (quote ignore))
+ '(ring-bell-function (quote ignore)))
- '(scroll-bar-mode nil)
- '(tool-bar-mode nil))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.

eww-bookmarks

@@ -1,6 +1,7 @@
 ;; Auto-generated file; don't edit
 ((:url "https://courses.cs.vt.edu/~cs1104/TowerOfBabel/LISP/Lisp.outline.html" :title "A Brief Introduction to Lisp" :time "Tue Nov 17 08:36:17 2020")
  (:url "http://steve-yegge.blogspot.com/2008/01/emergency-elisp.html" :title "Stevey's Blog Rants: Emergency Elisp" :time "Mon Nov 16 22:03:54 2020")
+ (:url "https://www.gnu.org/software/emacs/tour/" :title "GNU Emacs - Guided Tour - GNU Project" :time "Tue Nov 17 14:18:48 2020")
  (:url "https://docs.microsoft.com/en-us/graph/tutorials/python?tutorial-step=1" :title "Build Python Django apps with Microsoft Graph - Microsoft Graph | Microsoft Docs" :time "Fri Oct 30 15:40:15 2020")
  (:url "https://lispcookbook.github.io/cl-cookbook/" :title "Home" :time "Thu Oct 29 15:38:03 2020")
  (:url "http://www.gigamonkeys.com/book/" :title "Practical Common Lisp" :time "Thu Oct 29 15:37:51 2020")

init.el

@@ -1,4 +1,7 @@
+(require 'cl)
+
 (add-to-list 'load-path (expand-file-name "~/.emacs.d/bundle/"))
+(load "bundle--defaults")
 (load "bundle--server")
 (load "bundle--package")
 (load "bundle--customfile")
@@ -7,39 +10,9 @@
 (load "bundle--holidays")
 (load "bundle--latex")
 (load "bundle--mk")
+(load "bundle--hooks")
+(load "bundle--lists")
 ;; (load-theme 'nord t)
 (require 'color-theme-sanityinc-tomorrow)
 (defalias 'yes-or-no-p 'y-or-n-p)
 (org-clock-persistence-insinuate)
-
-;; HOOKS
-(add-hook 'diary-display-hook 'fancy-diary-display)
-(add-hook 'today-visible-calendar-hook 'calendar-mark-today)
-(add-hook 'write-file-hooks 'delete-trailing-whitespace)
-(add-hook 'diary-list-entries-hook 'diary-include-other-diary-files)
-(add-hook 'diary-mark-entries-hook 'diary-mark-included-diary-files)
-(defun me/org-mode ()
-  "My custom configuration for 'org-mode'."
-  ;(olivetti-mode)
-  (require 'olivetti)
-  (olivetti-set-width 82))
-(add-hook 'nov-mode-hook 'me/org-mode)
-(add-hook 'org-mode-hook 'turn-on-auto-fill)
-(add-hook 'rst-mode-hook 'turn-on-orgstruct)
-(add-hook 'newsticker-mode-hook 'imenu-add-menubar-index)
-(if (display-graphic-p)
-    (add-hook 'after-init-hook (lambda ()
-                                 (org-agenda-list)
-                                 (me/split-windows-horizontal))))
-
-(add-to-list 'auto-mode-alist '("\\.tmpl\\'" . web-mode))
-(add-to-list 'auto-mode-alist '("\\.lisp$" . lisp-mode))
-(add-to-list 'auto-mode-alist '("\\.lsp$" . lisp-mode))
-(add-to-list 'auto-mode-alist '("\\.cl$" . lisp-mode))
-(add-to-list 'auto-mode-alist '("\\.epub\\'" . nov-mode))
-(add-to-list 'auto-mode-alist '("\\.[Cc][Ss][Vv]\\'" . csv-mode))
-(add-to-list 'slime-contribs 'slime-autodoc)
-
-
-(put 'narrow-to-region 'disabled nil)
-(put 'narrow-to-page 'disabled nil)