From 1543d83910433978343b10eca767b0fe55cea461 Mon Sep 17 00:00:00 2001 From: Marcus Kammer Date: Mon, 25 Apr 2022 14:25:52 +0200 Subject: [PATCH 1/9] Update PATH with bin of mingw64 --- bundle/bundle--customfile.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bundle/bundle--customfile.el b/bundle/bundle--customfile.el index 2b849e28..b58515a5 100644 --- a/bundle/bundle--customfile.el +++ b/bundle/bundle--customfile.el @@ -8,6 +8,8 @@ ;; (add-to-list 'exec-path "C:/msys64/mingw64/bin") ;; (add-to-list 'exec-path "C:/msys64/usr/bin") + (setenv "PATH" (concat "C:\\msys64\\mingw64\\bin;" (getenv "PATH"))) + (setq sql-sqlite-program "c:/msys64/mingw64/bin/sqlite3.exe") (setq ispell-program-name "c:/msys64/mingw64/bin/aspell.exe") (setq nov-unzip-program "c:/msys64/usr/bin/unzip.exe") From fab07b72327356b303233fa91053b163054f3fd9 Mon Sep 17 00:00:00 2001 From: Marcus Kammer Date: Tue, 26 Apr 2022 09:17:41 +0200 Subject: [PATCH 2/9] Clean up settings for windows in customfile --- bundle/bundle--customfile.el | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/bundle/bundle--customfile.el b/bundle/bundle--customfile.el index b58515a5..a108b83f 100644 --- a/bundle/bundle--customfile.el +++ b/bundle/bundle--customfile.el @@ -7,17 +7,14 @@ (when (eq system-type 'windows-nt) ;; (add-to-list 'exec-path "C:/msys64/mingw64/bin") ;; (add-to-list 'exec-path "C:/msys64/usr/bin") + ;; (setenv "PATH" (concat "C:\\msys64\\mingw64\\bin;" (getenv "PATH"))) - (setenv "PATH" (concat "C:\\msys64\\mingw64\\bin;" (getenv "PATH"))) - - (setq sql-sqlite-program "c:/msys64/mingw64/bin/sqlite3.exe") - (setq ispell-program-name "c:/msys64/mingw64/bin/aspell.exe") - (setq nov-unzip-program "c:/msys64/usr/bin/unzip.exe") - - (setq custom-file "~/.emacs.d/bundle/custom_win32.el" - org-babel-python-command "python") - - (setq sbcl-exe (expand-file-name "C:\\Program Files\\Steel Bank Common Lisp\\sbcl.exe") + (setq sql-sqlite-program "c:/msys64/mingw64/bin/sqlite3.exe" + ispell-program-name "c:/msys64/mingw64/bin/aspell.exe" + nov-unzip-program "c:/msys64/usr/bin/unzip.exe" + custom-file "~/.emacs.d/bundle/custom_win32.el" + org-babel-python-command "python" + sbcl-exe (expand-file-name "C:\\Program Files\\Steel Bank Common Lisp\\sbcl.exe") sbcl-core (expand-file-name "C:\\Program Files\\Steel Bank Common Lisp\\sbcl.core") inferior-lisp-program "sbcl" slime-lisp-implementations `((sbcl (,sbcl-exe "--core" ,sbcl-core)))) From c91e554fef47967e18627929f1285c1980c2514e Mon Sep 17 00:00:00 2001 From: Marcus Kammer Date: Tue, 26 Apr 2022 09:18:15 +0200 Subject: [PATCH 3/9] Update win32 customfile --- bundle/custom_win32_EVG02667NB.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bundle/custom_win32_EVG02667NB.el b/bundle/custom_win32_EVG02667NB.el index 6609887a..5cbad5fa 100644 --- a/bundle/custom_win32_EVG02667NB.el +++ b/bundle/custom_win32_EVG02667NB.el @@ -65,7 +65,7 @@ '(org-roam-directory "d:/UserData/marcus.kammer/OneDrive - Siemens AG/org-roam") '(org-web-tools-pandoc-sleep-time 1.0) '(package-selected-packages - '(smartparens elfeed eglot javascript js-mode ob-http plantuml-mode rust-mode org-web-tools emojify erc-image slime-company shrface helpful xref yaml-mode webpaste web-mode use-package typescript-mode slime rainbow-delimiters racket-mode powershell ox-reveal org-tree-slide olivetti ob-typescript ob-rust ob-go nov go-mode geiser-racket elpy eldoc doom-themes doom-modeline counsel all-the-icons-dired ace-window)) + '(magit elpher simple-httpd csv-mode markdown-mode yaml nov yaml-mode webpaste web-mode use-package typescript-mode smartparens slime-company shrface rust-mode rainbow-delimiters racket-mode powershell plantuml-mode ox-reveal org-web-tools org-tree-slide olivetti ob-typescript ob-rust ob-http ob-go helpful go-mode geiser-racket erc-image emojify elpy elfeed eglot doom-themes doom-modeline counsel all-the-icons-dired ace-window)) '(plantuml-default-exec-mode 'jar) '(plantuml-jar-path "~/AppData/Local/Programs/plantuml/plantuml.jar") '(python-indent-guess-indent-offset nil) @@ -74,7 +74,7 @@ '(ring-bell-function 'ignore) '(scroll-bar-mode nil) '(scroll-step 5) - '(sql-sqlite-program "c:/msys64/mingw64/bin/sqlite3.exe") + '(sql-sqlite-program "c:/msys64/mingw64/bin/sqlite3.exe" t) '(tab-bar-mode nil) '(tetris-x-colors [[229 192 123] From fcae65f09e4ed9dd595566aa4813ab1038b1b96a Mon Sep 17 00:00:00 2001 From: Marcus Kammer Date: Fri, 29 Apr 2022 08:26:52 +0200 Subject: [PATCH 4/9] Define win32 specific folder in org-roam --- bundle/bundle--org.el | 74 +++++++++++++++++++++++-------------------- 1 file changed, 39 insertions(+), 35 deletions(-) diff --git a/bundle/bundle--org.el b/bundle/bundle--org.el index 1e8cd927..6eadbc5f 100644 --- a/bundle/bundle--org.el +++ b/bundle/bundle--org.el @@ -123,43 +123,47 @@ (typescript . t) (http . t)))) -;; (use-package org-roam -;; :init -;; (setq org-roam-v2-ack t) -;; (setq org-roam-db-location "~/org-roam.db") -;; (require 'org-roam-dailies) -;; :bind (("C-c r l" . org-roam-buffer-toggle) -;; ("C-c r f" . org-roam-node-find) -;; ("C-c r g" . org-roam-graph) -;; ("C-c r i" . org-roam-node-insert) -;; ("C-c r c" . org-roam-capture) -;; ("C-c r j" . org-roam-dailies-map) -;; :map org-roam-dailies-map -;; ("t" . org-roam-dailies-capture-today) -;; ("y" . org-roam-dailies-capture-yesterday) -;; ("T" . org-roam-dailies-capture-tomorrow) -;; :map org-mode-map -;; ("C-M-i" . completion-at-point)) -;; :custom -;; (org-roam-completion-everywhere t) -;; (org-roam-dailies-capture-templates -;; '(("d" "default" entry "* %<%R> %?" -;; :if-new (file+head "%<%F>.org" "#+title: %<%F>\n")))) -;; (org-roam-capture-templates -;; '(("d" "default" plain -;; "%?" -;; :if-new (file+head "%<%Y%m%d%H%M%S>-${slug}.org" "#+title: ${title}\n#+date: %U\n") -;; :unnarrowed t) -;; ("n" "Note" plain -;; "%?" -;; :if-new (file+head "%<%Y%m%d%H%M%S>-${slug}.org" "#+title: ${title}\n#+date: %U\n%l\n\n%i") -;; :unnarrowed t) +(use-package org-roam + :init + (setq org-roam-v2-ack t) + (setq org-roam-db-location "~/org-roam.db") + (when (eq system-type 'windows-nt) + (when (string= (system-name) "EVG02667NB") + (setq org-roam-directory "D:/UserData/marcus.kammer/OneDrive - Siemens AG/org-roam"))) + (require 'org-roam-dailies) + :bind (("C-c r l" . org-roam-buffer-toggle) + ("C-c r f" . org-roam-node-find) + ("C-c r g" . org-roam-graph) + ("C-c r i" . org-roam-node-insert) + ("C-c r c" . org-roam-capture) + ("C-c r j" . org-roam-dailies-map) + :map org-roam-dailies-map + ("t" . org-roam-dailies-capture-today) + ("y" . org-roam-dailies-capture-yesterday) + ("T" . org-roam-dailies-capture-tomorrow) + :map org-mode-map + ("C-M-i" . completion-at-point)) + :custom + (org-roam-completion-everywhere t) + (org-roam-dailies-capture-templates + '(("d" "default" entry "* %<%R> %?" + :if-new (file+head "%<%F>.org" "#+title: %<%F>\n")))) + (org-roam-capture-templates + '(("d" "default" plain + "%?" + :if-new (file+head "%<%Y%m%d%H%M%S>-${slug}.org" "#+title: ${title}\n#+date: %U\n") + :unnarrowed t) -;; ("p" "personas" plain -;; "%?" -;; :if-new (file+head "%<%Y%m%d%H%M%S>-${slug}.org" "#+title: ${title}\n#+date: %U\n* Personality\n* Behaviors\n* Needs & Goals\n") -;; :unnarrowed t)))) + ("n" "Note" plain + "%?" + :if-new (file+head "%<%Y%m%d%H%M%S>-${slug}.org" "#+title: ${title}\n#+date: %U\n%l\n\n%i") + :unnarrowed t) + + ("p" "personas" plain + "%?" + :if-new (file+head "%<%Y%m%d%H%M%S>-${slug}.org" "#+title: ${title}\n#+date: %U\n* Personality\n* Behaviors\n* Needs & Goals\n") + :unnarrowed t)))) (use-package org-tree-slide :bind ("" . org-tree-slide-mode) From a40eae6947ba7fbe8c4b9e2b5c7f9acbafa4b67d Mon Sep 17 00:00:00 2001 From: Marcus Kammer Date: Fri, 29 Apr 2022 14:40:46 +0200 Subject: [PATCH 5/9] Enable counsel package --- bundle/bundle--gui.el | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/bundle/bundle--gui.el b/bundle/bundle--gui.el index bcd0f6a9..76fdc897 100644 --- a/bundle/bundle--gui.el +++ b/bundle/bundle--gui.el @@ -1,11 +1,11 @@ -;; (use-package counsel -;; :bind (("C-M-j" . 'counsel-switch-buffer) -;; :map minibuffer-local-map -;; ("C-r" . 'counsel-minibuffer-history)) -;; :custom -;; (counsel-linux-app-format-function #'counsel-linux-app-format-function-name-only) -;; :config -;; (counsel-mode 1)) +(use-package counsel + :bind (("C-M-j" . 'counsel-switch-buffer) + :map minibuffer-local-map + ("C-r" . 'counsel-minibuffer-history)) + :custom + (counsel-linux-app-format-function #'counsel-linux-app-format-function-name-only) + :config + (counsel-mode 1)) (use-package all-the-icons :if (display-graphic-p) From f49bb1c11d0386a3ad46cd00a5890d3e6dd481c0 Mon Sep 17 00:00:00 2001 From: Marcus Kammer Date: Fri, 29 Apr 2022 14:41:13 +0200 Subject: [PATCH 6/9] Update news feeds --- bundle/bundle--news.el | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/bundle/bundle--news.el b/bundle/bundle--news.el index 23d3fe20..80e8e777 100644 --- a/bundle/bundle--news.el +++ b/bundle/bundle--news.el @@ -20,6 +20,7 @@ ("https://planet.emacslife.com/atom.xml" emacs) ("https://drewdevault.com/blog/index.xml" coding golang blog) ("https://emacsredux.com/atom.xml" emacs blog) + ("https://yiming.dev/rss.xml" coding emacs lisp blog) ("https://endlessparentheses.com/atom.xml" emacs elisp blog) ("https://blog.mozilla.org/en/feed/" browser web) ("https://blog.codinghorror.com/rss/" coding blog) @@ -39,11 +40,10 @@ ("https://emacsredux.com/atom.xml" emacs blog) ("https://marcus3santos.github.io/index.xml" emacs blog) ("https://pragdave.me/feed.xml" coding blog) - ("https://yiming.dev/rss.xml" coding emacs lisp blog) ;; ("https://feeds.feedburner.com/PythonInsider" security bugs python news) ("https://mailbox.org/share/feed-de-mailbox.xml" email mailbox web) - ("https://blog.codinghorror.com/rss/" blog coding) - ("https://makezine.com/feed/" blog hardware hacking make) +;; ("https://blog.codinghorror.com/rss/" blog coding) +;; ("https://makezine.com/feed/" blog hardware hacking make) ;; ("https://blog.pythonanywhere.com/index.xml" blog python hosting) ;; ("https://pbpython.com/feeds/all.atom.xml" blog python) ("https://feeds.feedburner.com/GoogleWebFonts" fonts blog google) @@ -54,18 +54,18 @@ ;; ("https://www.djangoproject.com/rss/weblog/" django python official news) ;; ("https://realpython.com/atom.xml?format=xml" python blog) ;; ("https://feeds.feedburner.com/PythonSoftwareFoundationNews" python psf news) - ("https://appliedgo.net/index.xml" golang blog) - ("https://blog.learngoprogramming.com/feed" golang blog) +;; ("https://appliedgo.net/index.xml" golang blog) +;; ("https://blog.learngoprogramming.com/feed" golang blog) ;; ("https://www.askpython.com/feed" python tutorials docs) - ("https://gosamples.dev/index.xml" golang blog) - ("https://golangbyexample.com/feed/" golang blog) - ("https://go.dev/blog/feed.atom" golang blog official) - ("https://golangdocs.com/feed" golang tutorials docs) - ("https://golangnews.com/index.xml" golang news) +;; ("https://gosamples.dev/index.xml" golang blog) +;; ("https://golangbyexample.com/feed/" golang blog) +;; ("https://go.dev/blog/feed.atom" golang blog official) +;; ("https://golangdocs.com/feed" golang tutorials docs) +;; ("https://golangnews.com/index.xml" golang news) ("https://metaebene.me/feed/m4a/" podcast) ;; ("https://blog.rust-lang.org/feed.xml" rust blog news) ) - elfeed-search-filter "@2-day-ago +unread")) + elfeed-search-filter "@4-day-ago +unread")) (use-package gnus :ensure nil From 0f649278e4db57270a9271c29d1ff4a173f62a26 Mon Sep 17 00:00:00 2001 From: Marcus Kammer Date: Fri, 29 Apr 2022 14:41:36 +0200 Subject: [PATCH 7/9] Define sqlite3 command for win32 --- bundle/bundle--org.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bundle/bundle--org.el b/bundle/bundle--org.el index 6eadbc5f..cf2f128b 100644 --- a/bundle/bundle--org.el +++ b/bundle/bundle--org.el @@ -109,6 +109,8 @@ (sequence "RECRUIT" "INTERVIEW" "TRANSCRIPT" "QDA" "DOC" "REVIEW"))) (org-use-property-inheritance nil) :config + (when (eq system-type 'windows-nt) + (setq org-babel-sqlite3-command "c:/msys64/mingw64/bin/sqlite3.exe")) (org-babel-do-load-languages 'org-babel-load-languages '((emacs-lisp . t) From f9d9f07d49adfa8b169ba7de013dedbc0638d37e Mon Sep 17 00:00:00 2001 From: Marcus Kammer Date: Fri, 29 Apr 2022 14:42:11 +0200 Subject: [PATCH 8/9] Update org roam dir --- bundle/bundle--org.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bundle/bundle--org.el b/bundle/bundle--org.el index cf2f128b..397711af 100644 --- a/bundle/bundle--org.el +++ b/bundle/bundle--org.el @@ -132,7 +132,8 @@ (setq org-roam-db-location "~/org-roam.db") (when (eq system-type 'windows-nt) (when (string= (system-name) "EVG02667NB") - (setq org-roam-directory "D:/UserData/marcus.kammer/OneDrive - Siemens AG/org-roam"))) + (setq org-roam-directory + (expand-file-name "D:\\UserData\\marcus.kammer\\OneDrive - Siemens AG\\org-roam")))) (require 'org-roam-dailies) :bind (("C-c r l" . org-roam-buffer-toggle) ("C-c r f" . org-roam-node-find) From 369041f1368915f5890aa76fbc7e4a4e231a4c47 Mon Sep 17 00:00:00 2001 From: Marcus Kammer Date: Fri, 29 Apr 2022 14:42:33 +0200 Subject: [PATCH 9/9] Update win32 customfile --- bundle/custom_win32_EVG02667NB.el | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/bundle/custom_win32_EVG02667NB.el b/bundle/custom_win32_EVG02667NB.el index 5cbad5fa..80269ff5 100644 --- a/bundle/custom_win32_EVG02667NB.el +++ b/bundle/custom_win32_EVG02667NB.el @@ -61,11 +61,9 @@ '(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 "~/AppData/Local/Programs/plantuml/plantuml.jar") '(org-roam-db-autosync-mode t) - '(org-roam-db-location "~/org-roam.db") - '(org-roam-directory "d:/UserData/marcus.kammer/OneDrive - Siemens AG/org-roam") '(org-web-tools-pandoc-sleep-time 1.0) '(package-selected-packages - '(magit elpher simple-httpd csv-mode markdown-mode yaml nov yaml-mode webpaste web-mode use-package typescript-mode smartparens slime-company shrface rust-mode rainbow-delimiters racket-mode powershell plantuml-mode ox-reveal org-web-tools org-tree-slide olivetti ob-typescript ob-rust ob-http ob-go helpful go-mode geiser-racket erc-image emojify elpy elfeed eglot doom-themes doom-modeline counsel all-the-icons-dired ace-window)) + '(org-roam magit elpher simple-httpd csv-mode markdown-mode yaml nov yaml-mode webpaste web-mode use-package typescript-mode smartparens slime-company shrface rust-mode rainbow-delimiters racket-mode powershell plantuml-mode ox-reveal org-web-tools org-tree-slide olivetti ob-typescript ob-rust ob-http ob-go helpful go-mode geiser-racket erc-image emojify elpy elfeed eglot doom-themes doom-modeline counsel all-the-icons-dired ace-window)) '(plantuml-default-exec-mode 'jar) '(plantuml-jar-path "~/AppData/Local/Programs/plantuml/plantuml.jar") '(python-indent-guess-indent-offset nil)