From 04c247e6f9064c5913edd7ebd5b40bd628a64e7c Mon Sep 17 00:00:00 2001
From: Marcus Kammer <2262664-marcuskammer@users.noreply.gitlab.com>
Date: Fri, 20 Nov 2020 19:45:29 +0100
Subject: [PATCH 1/5] Use ivy for completion

---
 bundle/custom_gnu.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bundle/custom_gnu.el b/bundle/custom_gnu.el
index f27795be..7abf652b 100644
--- a/bundle/custom_gnu.el
+++ b/bundle/custom_gnu.el
@@ -61,6 +61,7 @@
  '(package-enable-at-startup t)
  '(package-selected-packages
    '(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"))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.

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 2/5] 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}")))

From d41a948843af92da94feab636b9a0bb1f558d2c7 Mon Sep 17 00:00:00 2001
From: Marcus Kammer <2262664-marcuskammer@users.noreply.gitlab.com>
Date: Sat, 21 Nov 2020 12:11:26 +0100
Subject: [PATCH 3/5] Use magit forge lib

---
 bundle/bundle--package.el | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bundle/bundle--package.el b/bundle/bundle--package.el
index adf4fa3c..ee76bfe5 100644
--- a/bundle/bundle--package.el
+++ b/bundle/bundle--package.el
@@ -151,3 +151,6 @@ There are two things you can do about this warning:
          ("C-r" . 'counsel-minibuffer-history)))
 
 (use-package ox-reveal)
+
+(use-package forge
+  :after magit)

From e28be70574f765cb3ae6a0b405bc82983e7948b7 Mon Sep 17 00:00:00 2001
From: Marcus Kammer <2262664-marcuskammer@users.noreply.gitlab.com>
Date: Sat, 21 Nov 2020 12:13:49 +0100
Subject: [PATCH 4/5] Disable scroll bars in new frames

---
 bundle/custom_gnu.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bundle/custom_gnu.el b/bundle/custom_gnu.el
index 7abf652b..148017c7 100644
--- a/bundle/custom_gnu.el
+++ b/bundle/custom_gnu.el
@@ -60,9 +60,10 @@
  '(org-plantuml-jar-path "~/.local/bin/plantuml.jar")
  '(package-enable-at-startup t)
  '(package-selected-packages
-   '(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))
+   '(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"))
+ '(python-shell-interpreter "python3")
+ '(scroll-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.

From 6f4d234a82e36b440cb98b8737f6047a249c392f Mon Sep 17 00:00:00 2001
From: Marcus Kammer <2262664-marcuskammer@users.noreply.gitlab.com>
Date: Sat, 21 Nov 2020 14:37:26 +0100
Subject: [PATCH 5/5] Update defaults

---
 bundle/bundle--defaults.el | 23 ++++++++++++++++-------
 bundle/custom_gnu.el       |  7 -------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/bundle/bundle--defaults.el b/bundle/bundle--defaults.el
index 9e7e577a..902621ec 100644
--- a/bundle/bundle--defaults.el
+++ b/bundle/bundle--defaults.el
@@ -14,7 +14,7 @@
 (blink-cursor-mode -1)
 
 ;; Customization for locale, environment and computer
-(setq-default european-calendar-style 't)
+(setq-default european-calendar-style t)
 (setq-default calendar-christian-all-holidays-flag t)
 (setq-default calendar-date-style (quote iso))
 (setq-default calendar-view-diary-initially-flag t)
@@ -37,16 +37,25 @@
 (setq tab-width 4)
 (setq sentence-end-double-space nil)
 (setq next-line-add-newlines t)
-(setq require-final-newline 't)
+(setq require-final-newline t)
 
 ;; Miscellaneous
 (require 'cl-lib)
+(setq default-major-mode 'text-mode)
 (setq-default  inhibit-startup-buffer-menu t
                inhibit-startup-screen t)
-(put 'narrow-to-region 'disabled nil)
-(put 'narrow-to-page 'disabled nil)
-(setq default-major-mode 'text-mode)
-(add-hook 'text-mode-hook 'turn-on-auto-fill)
-(defalias 'yes-or-no-p 'y-or-n-p)
 (setq-default shr-cookie-policy nil)
 (setq-default tramp-default-method "ssh")
+(put 'narrow-to-region 'disabled nil)
+(put 'narrow-to-page 'disabled nil)
+(add-hook 'text-mode-hook 'turn-on-auto-fill)
+(defalias 'yes-or-no-p 'y-or-n-p)
+
+;; Windows, Frames
+(setq  default-frame-alist
+       '((font . "Fira Code-11")
+         (alpha . 100)
+         (undecorated . t)
+         (width . 85)
+         (height . 70)
+         (fullscreen . fullscreen)))
diff --git a/bundle/custom_gnu.el b/bundle/custom_gnu.el
index 148017c7..b87a2057 100644
--- a/bundle/custom_gnu.el
+++ b/bundle/custom_gnu.el
@@ -21,13 +21,6 @@
  '(custom-enabled-themes '(nord))
  '(custom-safe-themes
    '("37768a79b479684b0756dec7c0fc7652082910c37d8863c35b702db3f16000f8" "06bf0822aa77ea498bbd6038b59ad96fca43b272b49b18ab024218881ba134d1" "6e933f1668e124ec17fc7b6547f65ba760e06efb568a6c8091c600c67827e592" "7f6d4aebcc44c264a64e714c3d9d1e903284305fd7e319e7cb73345a9994f5ef" default))
- '(default-frame-alist
-    '((font . "Fira Code-11")
-      (alpha . 100)
-      (undecorated . t)
-      (width . 85)
-      (height . 70)
-      (fullscreen . fullscreen)))
  '(delete-selection-mode nil)
  '(diary-file "~/Documents/diary/diary")
  '(elpy-modules