From e0bf7205472ad53fd0acb6dcb436d1b263e8744c Mon Sep 17 00:00:00 2001
From: Marcus Kammer <2262664-marcuskammer@users.noreply.gitlab.com>
Date: Sat, 21 Nov 2020 09:26:01 +0100
Subject: [PATCH] Correct settings and defaults for emacs

---
 bundle/bundle--customfile.el | 11 ++++++++---
 bundle/bundle--defaults.el   |  7 ++++---
 bundle/bundle--hooks.el      |  3 +--
 bundle/bundle--mk.el         | 10 ++++++++++
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/bundle/bundle--customfile.el b/bundle/bundle--customfile.el
index 73e7c774..9f368968 100644
--- a/bundle/bundle--customfile.el
+++ b/bundle/bundle--customfile.el
@@ -2,6 +2,7 @@
 (when (eq system-type 'gnu/linux)
   (setq custom-file "~/.emacs.d/bundle/custom_gnu.el"))
 
+
 (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"))
@@ -10,11 +11,15 @@
         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"))
+    (setq custom-file "~/.emacs.d/bundle/custom_win32_EVG02667NB.el")
+    (setq plantuml-jar-path "c:/Users/Marcus.Kammer/AppData/Local/Programs/plantuml/plantuml.jar")
+    (setq plantuml-default-exec-mode 'jar))
+
+
   (when (string= (system-name) "XPS-8930")))
 
 ;; CUSTOM_FILE
diff --git a/bundle/bundle--defaults.el b/bundle/bundle--defaults.el
index cfdc896c..9e7e577a 100644
--- a/bundle/bundle--defaults.el
+++ b/bundle/bundle--defaults.el
@@ -20,9 +20,10 @@
 (setq-default calendar-view-diary-initially-flag t)
 (setq-default calendar-week-start-day 1)
 (setq-default ispell-program-name "aspell")
-(setq-default shell-file-name "/bin/bash")
-(setq-default tex-shell-file-name "/bin/bash")
 (setq-default grep-command "grep -i -nH -e ")
+(when (eq system-type 'gnu/linux)
+  (setq-default shell-file-name "/bin/bash")
+  (setq-default tex-shell-file-name "/bin/bash"))
 
 ;; Files and sessions
 (setq-default auto-save-timeout 60)
@@ -39,7 +40,7 @@
 (setq require-final-newline 't)
 
 ;; Miscellaneous
-(require 'cl)
+(require 'cl-lib)
 (setq-default  inhibit-startup-buffer-menu t
                inhibit-startup-screen t)
 (put 'narrow-to-region 'disabled nil)
diff --git a/bundle/bundle--hooks.el b/bundle/bundle--hooks.el
index f56c955e..3175db77 100644
--- a/bundle/bundle--hooks.el
+++ b/bundle/bundle--hooks.el
@@ -15,5 +15,4 @@
 (if (display-graphic-p)
     (add-hook 'after-init-hook (lambda ()
                                  (org-agenda-list)
-                                 (me/split-windows-horizontal)
-                                 (speedbar t))))
+                                 (me/split-windows-horizontal))))
diff --git a/bundle/bundle--mk.el b/bundle/bundle--mk.el
index 75499650..9fd30022 100644
--- a/bundle/bundle--mk.el
+++ b/bundle/bundle--mk.el
@@ -29,3 +29,13 @@
     (while (< count (1- count-windows))
       (split-window-below (- 0 height))
       (setq count (1+ count)))))
+
+(require 'ox-latex)
+(add-to-list 'org-latex-classes
+             '("koma-article"
+               "\\documentclass{scrartcl}"
+               ("\\section{%s}" . "\\section*{%s}")
+               ("\\subsection{%s}" . "\\subsection*{%s}")
+               ("\\subsubsection{%s}" . "\\subsubsection*{%s}")
+               ("\\paragraph{%s}" . "\\paragraph*{%s}")
+               ("\\subparagraph{%s}" . "\\subparagraph*{%s}")))