From e441a7337b674485a8fdd92cfef99fd7bde7d6de Mon Sep 17 00:00:00 2001 From: Marcus Kammer Date: Sat, 21 Oct 2023 13:07:07 +0200 Subject: [PATCH 01/11] Update plantuml package --- bundle/bundle--package.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bundle/bundle--package.el b/bundle/bundle--package.el index 8575ddaa..3e18594d 100644 --- a/bundle/bundle--package.el +++ b/bundle/bundle--package.el @@ -575,8 +575,10 @@ Uses `mk/hyperspec-dir-locations' to find the directory." (use-package plantuml-mode :defer t + :mode ("\\.puml\\'" "\\.plantuml\\'") :custom (plantuml-default-exec-mode 'jar) + (plantuml-jar-path "~/plantuml.jar") :config (when (eq system-type 'windows-nt) (let ((jar-path "~/AppData/Local/Programs/plantuml/plantuml.jar")) From b6ebf17c111d315c3ea7027016f3f4f8ddb52eaa Mon Sep 17 00:00:00 2001 From: Marcus Kammer Date: Sun, 22 Oct 2023 17:55:09 +0200 Subject: [PATCH 02/11] Set bold font to header-line and mode-line --- bundle/bundle--gui.el | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bundle/bundle--gui.el b/bundle/bundle--gui.el index e2676b48..8846b15b 100644 --- a/bundle/bundle--gui.el +++ b/bundle/bundle--gui.el @@ -49,6 +49,9 @@ " " "-%-")) +(set-face-attribute 'mode-line nil :weight 'bold) +(set-face-attribute 'header-line nil :weight 'bold) + (use-package all-the-icons :if (display-graphic-p) :commands all-the-icons-install-fonts From ef5b44b61e85959d86656dfaa42dc6027bda33b0 Mon Sep 17 00:00:00 2001 From: Marcus Kammer Date: Sun, 22 Oct 2023 18:52:27 +0200 Subject: [PATCH 03/11] Add space after directory path in header-line --- bundle/bundle--gui.el | 1 + 1 file changed, 1 insertion(+) diff --git a/bundle/bundle--gui.el b/bundle/bundle--gui.el index 8846b15b..b4e2bb35 100644 --- a/bundle/bundle--gui.el +++ b/bundle/bundle--gui.el @@ -39,6 +39,7 @@ '(:eval (my-vc-info)) '(:eval (if mode-line-process (concat ":" mode-line-process) "")) '(:eval (file-name-directory buffer-file-name)) + " " "-%-")) (setq-default mode-line-format From 526fafce700cc14ec29497f6c5a77d47aa99c2d0 Mon Sep 17 00:00:00 2001 From: Marcus Kammer Date: Sun, 22 Oct 2023 19:02:23 +0200 Subject: [PATCH 04/11] If Segoe UI Emoji Font, use unicode --- bundle/bundle--gui.el | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/bundle/bundle--gui.el b/bundle/bundle--gui.el index b4e2bb35..d74b1b0b 100644 --- a/bundle/bundle--gui.el +++ b/bundle/bundle--gui.el @@ -94,19 +94,16 @@ (use-package ace-window :init (global-set-key (kbd "M-o") 'ace-window)) -;; (use-package emojify -;; ;; https://ianyepan.github.io/posts/emacs-emojis/ -;; :config -;; (when (member "Segoe UI Emoji" (font-family-list)) -;; (set-fontset-font -;; t 'symbol (font-spec :family "Segoe UI Emoji") nil 'prepend)) -;; (setq emojify-display-style 'unicode) -;; (setq emojify-emoji-styles '(unicode))) +(use-package emojify + :config + (when (member "Segoe UI Emoji" (font-family-list)) + ;; https://ianyepan.github.io/posts/emacs-emojis/ + (set-fontset-font t 'symbol (font-spec :family "Segoe UI Emoji") nil 'prepend) + (setq emojify-display-style 'unicode) + (setq emojify-emoji-styles '(unicode)))) ;; (use-package vertico :init (vertico-mode)) -(use-package emojify) - (use-package webjump :bind ("C-c j" . webjump) :custom From c5df78d3313daa1bc25a1231ac36a80556c9e284 Mon Sep 17 00:00:00 2001 From: Marcus Kammer Date: Mon, 23 Oct 2023 08:40:01 +0200 Subject: [PATCH 05/11] Update nov-package --- bundle/bundle--package.el | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bundle/bundle--package.el b/bundle/bundle--package.el index 8575ddaa..9ae8ce76 100644 --- a/bundle/bundle--package.el +++ b/bundle/bundle--package.el @@ -29,8 +29,7 @@ (add-hook 'nov-mode-hook #'shrface-mode) :config (setq nov-text-width 82 - nov-variable-pitch t - nov-header-line-format "") + nov-variable-pitch t) (require 'shrface) (setq nov-shr-rendering-functions '((img . nov-render-img) (title . nov-render-title))) (setq nov-shr-rendering-functions (append nov-shr-rendering-functions shr-external-rendering-functions))) From 052789fe0421387702b4ca7869ba81fbfeb0ce2f Mon Sep 17 00:00:00 2001 From: Marcus Kammer Date: Mon, 23 Oct 2023 16:47:08 +0200 Subject: [PATCH 06/11] No need to define default-frame-alist twice --- bundle/bundle--general.el | 6 ------ 1 file changed, 6 deletions(-) diff --git a/bundle/bundle--general.el b/bundle/bundle--general.el index 71d7a137..bb03dc77 100644 --- a/bundle/bundle--general.el +++ b/bundle/bundle--general.el @@ -63,12 +63,6 @@ (setq horizontal-scroll-bar nil) (setq vertical-scroll-bar nil) -(setq default-frame-alist - '((font . "MonoLisa-11") - (width . 92) - (height . 62) - (alpha . 100))) - (setq mouse-wheel-scroll-amount '(1 ((shift) . 1) ((meta)) ((control) . text-scale))) (require 'ido) From 69db35a65e117649746616d113f3edb5e5c08365 Mon Sep 17 00:00:00 2001 From: Marcus Kammer Date: Mon, 23 Oct 2023 16:47:36 +0200 Subject: [PATCH 07/11] On windows after start jump to dir --- bundle/bundle--general.el | 1 + 1 file changed, 1 insertion(+) diff --git a/bundle/bundle--general.el b/bundle/bundle--general.el index bb03dc77..4172a2ec 100644 --- a/bundle/bundle--general.el +++ b/bundle/bundle--general.el @@ -106,6 +106,7 @@ (cd "d:/opt") (setq custom-file "~/.emacs.d/bundle/custom_win32_EVG02667NB.el")) (when (string= (system-name) "EVG03435NB") + (cd "~/OneDrive - Siemens AG/") (setq custom-file "~/.emacs.d/bundle/custom_win32_EVG03435NB.el"))) (load custom-file :noerror) From 1f3adf2356da2bdc8e7db19be35be88bd0e07eb4 Mon Sep 17 00:00:00 2001 From: Marcus Kammer Date: Mon, 23 Oct 2023 16:48:02 +0200 Subject: [PATCH 08/11] Update packages --- bundle/bundle--package.el | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/bundle/bundle--package.el b/bundle/bundle--package.el index 64659ad9..ca19f691 100644 --- a/bundle/bundle--package.el +++ b/bundle/bundle--package.el @@ -46,6 +46,7 @@ :defer t :config (when (eq system-type 'windows-nt) + (setq sql-sqlite-options '("-interactive")) (setq sql-mariadb-options '("-C" "-t" "-f" "-n")))) (use-package elisp-mode @@ -578,11 +579,7 @@ Uses `mk/hyperspec-dir-locations' to find the directory." :custom (plantuml-default-exec-mode 'jar) (plantuml-jar-path "~/plantuml.jar") - :config - (when (eq system-type 'windows-nt) - (let ((jar-path "~/AppData/Local/Programs/plantuml/plantuml.jar")) - (setq plantuml-jar-path jar-path - org-plantuml-jar-path jar-path)))) + (org-plantuml-jar-path "~/plantuml.jar")) (use-package tex-mode :defer t From cc32fba4351c2b49ae45b251113844231f0da2ad Mon Sep 17 00:00:00 2001 From: Marcus Kammer Date: Mon, 23 Oct 2023 16:48:16 +0200 Subject: [PATCH 09/11] Remove default-frame definition --- bundle/custom_win32.el | 6 ------ 1 file changed, 6 deletions(-) diff --git a/bundle/custom_win32.el b/bundle/custom_win32.el index d4f755e3..1fb411c6 100644 --- a/bundle/custom_win32.el +++ b/bundle/custom_win32.el @@ -7,12 +7,6 @@ '(bookmark-default-file "~/bookmarks.el") '(custom-safe-themes '("1a1ac598737d0fcdc4dfab3af3d6f46ab2d5048b8e72bc22f50271fd6d393a00" "fce3524887a0994f8b9b047aef9cc4cc017c5a93a5fb1f84d300391fba313743" "171d1ae90e46978eb9c342be6658d937a83aaa45997b1d7af7657546cae5985b" "37046960cf667c5ab3b76235d35a5db4763c531e706502a9067fa78db5a775c0" "9e39a8334e0e476157bfdb8e42e1cea43fad02c9ec7c0dbd5498cf02b9adeaf1" "37768a79b479684b0756dec7c0fc7652082910c37d8863c35b702db3f16000f8" default)) - '(default-frame-alist - '((tab-bar-lines . 1) - (font . "MonoLisa-11") - (width . 85) - (height . 55) - (vertical-scroll-bars))) '(doc-view-resolution 150) '(epg-gpg-home-directory "~/AppData/Roaming/gnupg") '(epg-gpg-program "c:/Program Files (x86)/GnuPG/bin/gpg.exe") From fa7f6290cee0186f33416878bc332e1118680841 Mon Sep 17 00:00:00 2001 From: Marcus Kammer Date: Mon, 23 Oct 2023 16:48:36 +0200 Subject: [PATCH 10/11] Update eww bookmarks --- eww-bookmarks | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eww-bookmarks b/eww-bookmarks index a0c04645..70a018cd 100644 --- a/eww-bookmarks +++ b/eww-bookmarks @@ -1,5 +1,6 @@ ;; Auto-generated file; don't edit -*- mode: lisp-data -*- -((:url "https://mercurial-book.readthedocs.io/en/latest/index.html" :title "Mercurial: the definitive guide — Mercurial Book" :time "Fri Jun 16 09:31:32 2023") +((:url "https://sqlite.org/cli.html" :title "Command Line Shell For SQLite" :time "Mon Oct 23 15:13:18 2023") + (:url "https://mercurial-book.readthedocs.io/en/latest/index.html" :title "Mercurial: the definitive guide — Mercurial Book" :time "Fri Jun 16 09:31:32 2023") (:url "https://diataxis.fr/#" :title "Diátaxis" :time "Thu Jan 26 22:00:45 2023") (:url "https://github.com/sguessou/CL-gentle-intro" :title "GitHub - sguessou/CL-gentle-intro: Common Lisp: A Gentle Introduction to Symbolic Computation" :time "Thu Jan 12 17:20:32 2023") (:url "https://about.gitlab.com/company/okrs/" :title "Objectives and Key Results (OKRs) | GitLab" :time "Thu Jan 12 14:32:32 2023") From bc0e31a91dfa27b72de1429d704f6153bbe60a7d Mon Sep 17 00:00:00 2001 From: Marcus Kammer Date: Mon, 23 Oct 2023 18:07:22 +0200 Subject: [PATCH 11/11] Move space in header-line --- bundle/bundle--gui.el | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bundle/bundle--gui.el b/bundle/bundle--gui.el index d74b1b0b..b931510e 100644 --- a/bundle/bundle--gui.el +++ b/bundle/bundle--gui.el @@ -38,8 +38,7 @@ '(:eval mode-name) " " '(:eval (my-vc-info)) '(:eval (if mode-line-process (concat ":" mode-line-process) "")) - '(:eval (file-name-directory buffer-file-name)) - " " + '(:eval (concat (file-name-directory buffer-file-name) " ")) "-%-")) (setq-default mode-line-format