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

bundle/bundle--customfile.el

@@ -1,6 +1,12 @@
 ;; OS SETTINGS
 (when (eq system-type 'gnu/linux)
-  (setq custom-file "~/.emacs.d/bundle/custom_gnu.el"))
+  (setq custom-file "~/.emacs.d/bundle/custom_gnu.el"
+        org-directory "~/Documents/journal/"
+        org-agenda-files '("~/Documents/journal/")
+        org-default-notes-file "notes.org"
+        org-babel-python-command "python3"
+        browse-url-secondary-browser-function 'browse-url-firefox
+        python-shell-interpreter "python3"))
 
 
 (when (eq system-type 'windows-nt)
@@ -12,6 +18,8 @@
 	inferior-lisp-program "sbcl"
 	slime-lisp-implementations `((sbcl (,sbcl-exe "--core" ,sbcl-core))))
 
+  (setq python-shell-interpreter "python")
+
   (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--package.el

@@ -40,7 +40,9 @@ There are two things you can do about this warning:
 
 (use-package projectile
   :init
-  (projectile-mode +1))
+  (projectile-mode +1)
+  :config
+  (setq projectile-completion-system (quote ivy)))
 
 (define-key projectile-mode-map (kbd "s-p") 'projectile-command-map)
 (define-key projectile-mode-map (kbd "C-c p") 'projectile-command-map)
@@ -96,7 +98,9 @@ There are two things you can do about this warning:
         org-agenda-inhibit-startup nil
         org-agenda-span 6
         org-agenda-start-on-weekday nil
+        org-agenda-include-diary t
         org-babel-shell-names (quote ("sh" "bash" "csh" "ash" "dash" "ksh" "mksh" "posh"))
+        org-adapt-indentation t
         org-clock-persist t
         org-confirm-babel-evaluate nil
         org-html-doctype "html5"

bundle/custom_gnu.el

@@ -9,7 +9,6 @@
  '(ansi-color-names-vector
    ["#212526" "#ff4b4b" "#b4fa70" "#fce94f" "#729fcf" "#e090d7" "#8cc4ff" "#eeeeec"])
  '(backup-directory-alist '(("." . "~/.backup_filez")))
- '(browse-url-secondary-browser-function 'browse-url-firefox)
  '(custom-enabled-themes '(nord))
  '(custom-safe-themes
    '("37768a79b479684b0756dec7c0fc7652082910c37d8863c35b702db3f16000f8" "06bf0822aa77ea498bbd6038b59ad96fca43b272b49b18ab024218881ba134d1" "6e933f1668e124ec17fc7b6547f65ba760e06efb568a6c8091c600c67827e592" "7f6d4aebcc44c264a64e714c3d9d1e903284305fd7e319e7cb73345a9994f5ef" default))
@@ -23,20 +22,13 @@
  '(nov-text-width nil)
  '(nov-variable-pitch nil)
  '(olivetti-body-width 73)
- '(org-adapt-indentation t)
- '(org-agenda-include-diary t)
- '(org-babel-python-command "python3")
- '(org-default-notes-file "~/Documents/journal/notes.org")
- '(org-directory "~/Documents/journal/")
- '(org-agenda-files (list org-directory))
  '(org-modules
    '(ol-bbdb ol-docview ol-eww ol-gnus ol-info ol-irc ol-mhe ol-rmail org-tempo ol-w3m orgtbl-sqlinsert))
  '(org-plantuml-jar-path "~/.local/bin/plantuml.jar")
  '(package-enable-at-startup t)
  '(package-selected-packages
-   '(forge request all-the-icons-ibuffer all-the-icons-ivy-rich all-the-icons-ivy-rich-mode all-the-icons-ibuffer-mode ox-reveal csv-mode gnuplot eglot projectile elpy color-theme-sanityinc-tomorrow nov markdown-mode markdown-preview-mode olivetti web-mode js2-mode slime flymake-racket racket-mode yaml-mode lua-mode nordless-theme use-package colorless-themes nord-theme toc-org ace-window htmlize ivy magit))
+   '(powershell forge request all-the-icons-ibuffer all-the-icons-ivy-rich all-the-icons-ivy-rich-mode all-the-icons-ibuffer-mode ox-reveal csv-mode gnuplot eglot projectile elpy color-theme-sanityinc-tomorrow nov markdown-mode markdown-preview-mode olivetti web-mode js2-mode slime flymake-racket racket-mode yaml-mode lua-mode nordless-theme use-package colorless-themes nord-theme toc-org ace-window htmlize ivy magit))
  '(projectile-completion-system 'ivy)
- '(python-shell-interpreter "python3")
  '(scroll-bar-mode nil))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.

bundle/custom_win32_EVG02667NB.el

@@ -45,30 +45,19 @@
  '(olivetti-lighter " Olv")
  '(olivetti-minimum-body-width 80)
  '(olivetti-mode-hook nil t)
- '(org-agenda-include-diary t)
+ '(org-agenda-files '("d:/UserData/marcus.kammer/OneDrive - Siemens AG/documents/Journal/"))
  '(org-clock-out-remove-zero-time-clocks t)
  '(org-default-notes-file "notes.org")
  '(org-directory
    "d:/UserData/marcus.kammer/OneDrive - Siemens AG/documents/Journal/")
- '(org-agenda-files (list org-directory))
- '(org-export-with-sub-superscripts nil)
- '(org-html-htmlize-output-type nil)
- '(org-html-table-caption-above nil)
- '(org-html-table-default-attributes
-   (quote
-    (:border "2" :cellspacing "0" :cellpadding "6" :rules "groups" :frame "hsides" :width "100%")))
  '(org-modules
    (quote
     (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
     (powershell forge 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))
  '(scroll-bar-mode nil))
 (custom-set-faces