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

bundle/bundle--customfile.el

@@ -16,7 +16,11 @@
         '(("german" "[[:alpha:]]" "[^[:alpha:]]" "[']" t ("-d" "de_DE_frami,de_AT_frami,de_CH_frami") nil utf-8)
           ("english" "[[:alpha:]]" "[^[:alpha:]]" "[']" nil ("-d" "en_US") nil utf-8)
           ("german,english" "[[:alpha:]]" "[^[:alpha:]]" "[']" nil ("-d" "de_DE_frami,en_US") nil utf-8))
-        ispell-hunspell-dictionary-alist ispell-local-dictionary-alist))
+        ispell-hunspell-dictionary-alist ispell-local-dictionary-alist)
+  (when (file-exists-p "~/Documents/slime_filename_translations.el")
+    (load-file "~/Documents/slime_filename_translations.el"))
+  (setq common-lisp-hyperspec-root
+        (concat "file://" (expand-file-name "~/Documents/sites/lisp-docs/HyperSpec-7-0/HyperSpec/"))))
 
 (when (eq system-type 'windows-nt)
   ;; (add-to-list 'exec-path "C:/msys64/mingw64/bin")
@@ -36,6 +40,8 @@
           ("english" "[[:alpha:]]" "[^[:alpha:]]" "[']" nil ("-d" "en_US") nil utf-8)
           ("german,english" "[[:alpha:]]" "[^[:alpha:]]" "[']" nil ("-d" "de_DE_frami,en_US") nil utf-8))
         ispell-hunspell-dictionary-alist ispell-local-dictionary-alist)
+  (when (file-exists-p "d:/visua/Documents/slime_filename_translations.el")
+    (load-file "d:/visua/Documents/slime_filename_translations.el"))
 
   ;; (defun powershell (&optional buffer)
   ;;   "Launches a powershell in buffer *powershell* and switches to it."
@@ -47,7 +53,9 @@
 
   (when (string= (system-name) "EVG02667NB")
     (cd "d:/opt")
-    (setq custom-file "~/.emacs.d/bundle/custom_win32_EVG02667NB.el")))
+    (setq custom-file "~/.emacs.d/bundle/custom_win32_EVG02667NB.el")
+    (setq common-lisp-hyperspec-root
+          (concat "file:///" (expand-file-name "~/sites/HyperSpec/")))))
 
 ;; CUSTOM_FILE
 (load custom-file :noerror)

bundle/bundle--email.el

@@ -1,6 +1,6 @@
 (setq smtpmail-smtp-server "smtp.mailbox.org"
       smtpmail-smtp-service 465
-      smtpmail-stream-type 'ssl
+      smtpmail-stream-type 'starttls
       message-send-mail-function 'smtpmail-send-it
       mml-default-sign-method "pgpmime"
       mml-default-encrypt-method "pgpmime"
@@ -59,3 +59,19 @@
     (mu4e-trash-folder "/Trash")
     (mu4e-split-view 'horizontal)
     (mu4e-update-interval (* 10 60))))
+
+(use-package gnus
+  :ensure nil
+  :hook (gnus-summary-prepare . gnus-summary-sort-by-most-recent-date)
+  :custom
+  (gnus-inhibit-startup-message t)
+  (gnus-check-new-newsgroups nil)
+  (gnus-select-method '(nntp "news.individual.de"
+                             (nntp-open-connection-function nntp-open-ssl-stream)
+                             (nntp-port-number 563)))
+  :config
+  (add-to-list 'gnus-secondary-select-methods
+               '(nnimap "mailbox"
+                        (nnimap-address "imap.mailbox.org")
+                        (nnimap-server-port 143)
+                        (nnimap-stream starttls))))

bundle/bundle--news.el

@@ -88,20 +88,3 @@
      ("https://www.klimareporter.de/tag/klimaupdate?format=feed&type=atom" podcast umwelt klima)
      ("https://ct-uplink.podigee.io/feed/mp3" podcast technik computer)
      ("https://feeds.soundcloud.com/users/soundcloud:users:261098918/sounds.rss" podcast osint))))
-
-(use-package gnus
-  :ensure nil
-  :hook (gnus-summary-prepare . gnus-summary-sort-by-most-recent-date)
-  :custom
-  (user-full-name "Marcus Kammer")
-  (gnus-inhibit-startup-message t)
-  (gnus-check-new-newsgroups nil)
-  (gnus-select-method '(nntp "news.individual.de"
-                             (nntp-open-connection-function nntp-open-ssl-stream)
-                             (nntp-port-number 563)))
-  :config
-  (add-to-list 'gnus-secondary-select-methods
-               '(nnimap "mailbox"
-                        (nnimap-address "imap.mailbox.org")
-                        (nnimap-server-port 143)
-                        (nnimap-stream starttls))))

bundle/bundle--package.el

@@ -153,10 +153,6 @@
                  slime-editing-commands
                  slime-sbcl-exts))
   (progn
-    (setq common-lisp-hyperspec-root
-          (let ((file (if (eq system-type 'windows-nt) "file:///" "file://")))
-            (concat file
-                    (expand-file-name "~/Documents/sites/lisp-docs/HyperSpec-7-0/HyperSpec/"))))
     (setq common-lisp-hyperspec-symbol-table
           (concat common-lisp-hyperspec-root "Data/Map_Sym.txt"))
     (setq common-lisp-hyperspec-issuex-table
@@ -168,14 +164,8 @@
             slime-lisp-implementations `((sbcl (,sbcl-exe "--noinform" "--core" ,sbcl-core))))
     (setq inferior-lisp-program "/usr/bin/sbcl --noinform"))
   (let ((helper (expand-file-name "~/quicklisp/slime-helper.el")))
-    (when (file-exists-p helper) (load helper)))
-  (let* ((docs-dir
-          (if (eq system-type 'windows-nt)
-              (expand-file-name "d:/visua/Documents")
-            (expand-file-name "~/Documents")))
-         (file (concat docs-dir "/slime_filename_translations.el")))
-    (when (file-exists-p file)
-      (load-file file))))
+    (when (file-exists-p helper) (load-file helper))))
+
 (use-package simple-httpd
   :defer t)
 
@@ -260,4 +250,8 @@
 
 (load "bundle--irc")
 (load "bundle--news")
-(load "bundle--email")
+
+(let ((identity (expand-file-name "~/.email-identity.el")))
+  (when (file-exists-p identity)
+    (load-file identity)
+    (load "bundle--email")))