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

bundle/bundle--customfile.el

@@ -12,7 +12,7 @@
 (when (eq system-type 'windows-nt)
   (setq custom-file "~/.emacs.d/bundle/custom_win32.el")
   (add-to-list 'load-path (expand-file-name "~/AppData/Roaming/__secrets"))
-  (cd "d:/opt")
+
   (setq sbcl-exe (expand-file-name "C:\\Program Files\\Steel Bank Common Lisp\\2.0.0\\sbcl.exe")
         sbcl-core (expand-file-name "C:\\Program Files\\Steel Bank Common Lisp\\2.0.0\\sbcl.core")
 	inferior-lisp-program "sbcl"
@@ -21,6 +21,7 @@
   (setq python-shell-interpreter "python")
 
   (when (string= (system-name) "EVG02667NB")
+    (cd "d:/opt")
     (add-to-list 'Info-default-directory-list "~/Info")
     (setq custom-file "~/.emacs.d/bundle/custom_win32_EVG02667NB.el")
     (setq plantuml-jar-path "c:/Users/Marcus.Kammer/AppData/Local/Programs/plantuml/plantuml.jar")

bundle/custom_win32.el

@@ -3,28 +3,16 @@
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
- '(ansi-color-faces-vector
-   [default default default italic underline success warning error])
  '(custom-enabled-themes (quote (nord)))
  '(custom-safe-themes
    (quote
-    ("37768a79b479684b0756dec7c0fc7652082910c37d8863c35b702db3f16000f8" "7f6d4aebcc44c264a64e714c3d9d1e903284305fd7e319e7cb73345a9994f5ef" default)))
- '(default-frame-alist
-    (quote
-     ((font . "Fira Code-11")
-      (vertical-scroll-bars)
-      (fullscreen . maximized))))
- '(inhibit-startup-buffer-menu t)
- '(initial-buffer-choice "~/Documents/Journal/notes.org")
- '(menu-bar-mode nil)
- '(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)))
+    ("37768a79b479684b0756dec7c0fc7652082910c37d8863c35b702db3f16000f8" default)))
+ '(org-agenda-files (quote ("~/Documents/journal")))
+ '(org-default-notes-file "notes.org")
+ '(org-directory "~/Documents/journal")
  '(package-selected-packages
    (quote
-    (eglot olivetti slime web-mode js2-mode projectile nov color-theme-sanityinc-tomorrow elpy use-package nord-theme nordless-theme org toc-org ox-reveal ace-window htmlize ivy magit)))
- '(scroll-bar-mode nil)
- '(tool-bar-mode nil))
+    (geiser all-the-icons powershell forge counsel helpful web-mode use-package toc-org slime projectile ox-reveal olivetti nov nordless-theme nord-theme memoize magit js2-mode ivy htmlize f elpy elisp-refs eglot dash-functional color-theme-sanityinc-tomorrow ace-window))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.