From 77227720554a0ce87f1428b5ca7350d197a10048 Mon Sep 17 00:00:00 2001 From: Marcus Kammer <2262664-marcus-kammer@users.noreply.gitlab.com> Date: Thu, 20 Feb 2020 19:09:41 +0100 Subject: [PATCH 1/2] Update org mode settings --- bundle/org-mode-settings.el | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/bundle/org-mode-settings.el b/bundle/org-mode-settings.el index e928056b..333eeab8 100644 --- a/bundle/org-mode-settings.el +++ b/bundle/org-mode-settings.el @@ -30,14 +30,15 @@ (org-clock-persistence-insinuate) (org-display-inline-images) -(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")))) +(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 From 78f80abdcebdd4019a71e701072a5f49f9e7c37b Mon Sep 17 00:00:00 2001 From: Marcus Kammer <2262664-marcus-kammer@users.noreply.gitlab.com> Date: Mon, 24 Feb 2020 17:00:22 +0100 Subject: [PATCH 2/2] Update configs --- bundle/custom.el | 3 ++- bundle/display.el | 1 + eww-bookmarks | 3 ++- init.el | 7 +++---- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/bundle/custom.el b/bundle/custom.el index 4adfd49c..f68fd10d 100644 --- a/bundle/custom.el +++ b/bundle/custom.el @@ -58,7 +58,8 @@ ("Python PEP" "https://www.python.org/dev/peps/peps.rss/" nil 3600 nil) ("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)))) + ("nixcraft" "https://www.cyberciti.biz/atom/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) diff --git a/bundle/display.el b/bundle/display.el index 86fd992c..3b4007e3 100644 --- a/bundle/display.el +++ b/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))) diff --git a/eww-bookmarks b/eww-bookmarks index 2aa01213..82186e2e 100644 --- a/eww-bookmarks +++ b/eww-bookmarks @@ -1,5 +1,6 @@ ;; Auto-generated file; don't edit -((: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://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") (:url "https://org-babel.readthedocs.io/en/latest/" :title "Org Babel reference card" :time "Mon Feb 17 20:38:25 2020") diff --git a/init.el b/init.el index 3da67576..465dcf9c 100755 --- a/init.el +++ b/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,