Merge branch 'main' of git.sr.ht:~marcuskammer/emacs.d

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)
@@ -112,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)

bundle/bundle--gui.el

@@ -38,7 +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
@@ -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
@@ -90,19 +93,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

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)))
@@ -47,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
@@ -575,13 +575,11 @@ Uses `mk/hyperspec-dir-locations' to find the directory."
 
 (use-package plantuml-mode
   :defer t
+  :mode ("\\.puml\\'" "\\.plantuml\\'")
   :custom
   (plantuml-default-exec-mode '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))))
+  (plantuml-jar-path "~/plantuml.jar")
+  (org-plantuml-jar-path "~/plantuml.jar"))
 
 (use-package tex-mode
   :defer t

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")

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")