Merge branch 'cleanup-dot-emacs-dir' of gitlab.com:marcuskammer/emacs.d into cleanup-dot-emacs-dir

bundle/custom_win32_EVG02667NB.el

@@ -0,0 +1,32 @@
+(custom-set-variables
+ ;; custom-set-variables was added by Custom.
+ ;; 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])
+ '(default-frame-alist
+    (quote
+     ((undecorated . t)
+      (font . "Iosevka Term-12")
+      (fullscreen . maximized)
+      (alpha . 98))))
+ '(inhibit-startup-buffer-menu t)
+ '(initial-buffer-choice "d:/syncplicity/Marcus.Kammer/documents/Journal/notes.org")
+ '(org-agenda-files (quote ("d:/syncplicity/Marcus.Kammer/documents/Journal/")))
+ '(org-default-notes-file "d:/syncplicity/Marcus.Kammer/documents/Journal/notes.org")
+ '(org-duration-format (quote h:mm))
+ '(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")
+ '(package-selected-packages
+   (quote
+    (elpy use-package nord-theme nordless-theme org toc-org ox-reveal ace-window htmlize ivy magit))))
+(custom-set-faces
+ ;; custom-set-faces was added by Custom.
+ ;; 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.
+ )

init.el

@@ -22,20 +22,14 @@
   (package-initialize)
 
 ;; OS SETTINGS
-  (defun evo-load-paths ()
-    (unless (file-directory-p (expand-file-name "~/Documents"))
-      (defvar *docs-path* (getenv "DOCS_PATH"))))
-
   (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")
-    (setq python-shell-interpreter "python")
     (add-to-list 'load-path (expand-file-name "~/AppData/Roaming/__secrets"))
     (cd "~/opt")
     (when (string= (system-name) "EVG02667NB")
-      (evo-load-paths)
       (setq custom-file "~/.emacs.d/bundle/custom_win32_EVG02667NB.el"))
     (when (string= (system-name) "XPS-8930")))
 
@@ -86,7 +80,6 @@
   (set-keyboard-coding-system 'utf-8)
   (setq default-buffer-file-coding-system 'utf-8)
   (defalias 'yes-or-no-p 'y-or-n-p)
-  (with-current-buffer "*scratch*" (emacs-lock-mode 'kill))
 
 ;; PACKAGES
   (ivy-mode 1)
@@ -95,10 +88,9 @@
     :ensure t
     :init
     (elpy-enable))
+
 ;; ORG_MODE SETTINGS
   (setq org-agenda-dim-blocked-tasks nil
-	org-agenda-files (quote
-			  ("~/Documents/Journal"))
 	org-agenda-inhibit-startup nil
 	org-babel-load-languages (quote
 				  ((js . t)
@@ -115,29 +107,14 @@
 	org-babel-shell-names (quote ("sh" "bash" "csh" "ash" "dash" "ksh" "mksh" "posh"))
 	org-clock-persist t
 	org-confirm-babel-evaluate nil
-	org-default-notes-file "~/Documents/Journal/notes.org"
 	org-html-doctype "html5"
 	org-html-html5-fancy t
 	org-log-done (quote time)
-	org-startup-folded nil
+	org-startup-folded t
 	org-startup-truncated nil
-	org-babel-python-command "python3"
-	org-todo-keywords (quote ((sequence "TODO" "FEEDBACK" "VERIFY" "|" "DONE" "DELEGATED"))))
-  (setq org-use-property-inheritance nil)
+	org-todo-keywords (quote ((sequence "TODO" "FEEDBACK" "VERIFY" "|" "DONE" "DELEGATED")))
+	org-use-property-inheritance nil)
   (org-clock-persistence-insinuate)
-  (org-display-inline-images)
-  (when (eq system-type 'windows-nt)
-    (setq org-duration-format (quote h:mm))
-    (setq org-babel-python-command "python")
-    (setq org-plantuml-jar-path (expand-file-name
-				 "~/AppData/Local/Programs/plantuml/plantuml.jar"))
-    (when (string= (system-name) "EVG02667NB")
-      (when *docs-path*
-	(setq org-agenda-files `(,(concat *docs-path* "\\Journal")))
-	(setq org-default-notes-file (concat *docs-path* "\\Journal\\notes.org")))))
-  (when (eq system-type 'gnu/linux)
-    (setq org-plantuml-jar-path
-	(expand-file-name "~/.local/bin/plantuml.jar")))
 
 ;; HOOKS
   (add-hook 'diary-display-hook 'fancy-diary-display)