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

bundle/custom.el

@@ -59,7 +59,8 @@
          ("Omegacube" "https://www.omegacube.com/feed/" nil 3600 nil)
          ("logisticsbureau" "https://www.logisticsbureau.com/feed/" nil 3600 nil)
          ("nixcraft" "https://www.cyberciti.biz/atom/atom.xml" nil nil nil)
-         ("realpython" "https://realpython.com/atom.xml" nil nil nil))))
+         ("realpython" "https://realpython.com/atom.xml" nil nil nil)
+         ("Gitlab weblog" "https://about.gitlab.com/atom.xml" nil nil nil))))
  '(nord-comment-brightness 15)
  '(nord-region-highlight "snowstorm")
  '(nord-uniform-mode-lines t)

bundle/display.el

@@ -18,6 +18,7 @@
 
 (add-to-list 'default-frame-alist '(fullscreen . maximized)) ; Maximize Window
 (add-to-list 'default-frame-alist '(font . "Iosevka Term-14"))
+
 (when (eq system-type 'gnu/linux)
   (add-to-list 'default-frame-alist '(undecorated . t)))
 

bundle/org-mode-settings.el

@@ -30,14 +30,15 @@
 (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")
-  (setq org-duration-format (quote h:mm)
-        org-babel-python-command "python")
-  (setq org-plantuml-jar-path
-      (expand-file-name "~/AppData/Local/Programs/plantuml/plantuml.jar"))
     (when *docs-path*
-    (setq org-agenda-files `(,(concat *docs-path* "\\Journal"))
-          org-default-notes-file (concat *docs-path* "\\Journal\\notes.org"))))
+      (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

eww-bookmarks

@@ -1,6 +1,8 @@
 ;; Auto-generated file; don't edit
+
 ((:url "https://ipython.readthedocs.io/en/stable/index.html" :title "IPython Documentation — IPython 7.12.0 documentation" :time "Sun Feb 23 19:38:39 2020")
  (:url "https://sw.kovidgoyal.net/kitty/index.html" :title "kitty - the fast, featureful, GPU based terminal emulator — kitty 0.16.0 documentation" :time "Sat Feb 22 16:44:19 2020")
+(:url "https://www.sciencedirect.com/" :title "ScienceDirect.com | Science, health and medical journals, full text articles and books." :time "Mon Feb 24 10:51:56 2020")
  (:url "https://elpy.readthedocs.io/en/latest/index.html" :title "Elpy — Elpy 1.32.0 documentation" :time "Wed Feb 19 19:01:44 2020")
  (:url "https://github.com/dfeich/org-babel-examples" :title "GitHub - dfeich/org-babel-examples: Examples using emacs org mode babel inline source code with different backend languages" :time "Tue Feb 18 14:45:12 2020")
  (:url "https://github.com/skuro/plantuml-mode" :title "GitHub - skuro/plantuml-mode: A major mode for editing PlantUML sources in Emacs" :time "Tue Feb 18 14:44:15 2020")

init.el

@@ -1,3 +1,6 @@
+(require 'server)
+(unless (server-running-p) (server-start))
+
 ;; ==================== GLOBAL KEYS ==================== ;;
 (global-set-key (kbd "C-c l") 'org-store-link)
 (global-set-key (kbd "C-c a") 'org-agenda)
@@ -10,10 +13,6 @@
 (global-set-key (kbd "C-c n") 'newsticker-start)
 ;; (global-unset-key "\C-z")
 
-;; start a server, unless one is already running
-(require 'server)
-(unless (server-running-p) (server-start))
-
 (require 'package)
 ;; Added by Package.el.  This must come before configurations of
 ;; installed packages.  Don't delete this line.  If you don't want it,