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

bundle/bundle--email.el

@@ -9,7 +9,7 @@
   (mu4e-sent-folder "/Sent")
   (mu4e-trash-folder "/Trash")
   (mu4e-split-view nil)
-  (mu4e-compose-signature "Cheers Marcus (Nuremberg . Germany)")
+  (mu4e-compose-signature "Cheers Marcus (Nuremberg . Germany)\nGnuPG Key: https://meta.sr.ht/~marcuskammer.pgp\nFingerprint: 86DB 0F30 F9F1 661A 54E2 1664 C374 817B E285 268F")
   (mu4e-update-interval (* 10 60)))
 
 (require 'smtpmail)

bundle/bundle--org.el

@@ -96,6 +96,8 @@
   (org-babel-do-load-languages
    'org-babel-load-languages
    '((emacs-lisp . t)
+     (gnuplot . t)
+     (C . t)
      (js . t)
      (lisp . t)
      (python . t)

bundle/bundle--package.el

@@ -16,6 +16,32 @@
 (require 'use-package)
 (setq use-package-always-ensure t)
 
+;; STANDARD MODES
+(use-package lisp-mode
+  :ensure nil
+  :mode (("\\.lisp$" . lisp-mode)
+         ("\\.lsp$" . lisp-mode)
+         ("\\.cl$" . lisp-mode)))
+
+(use-package cc-mode
+  :ensure nil
+  :custom
+  (c-basic-offset 4)
+  (c-default-style '((c-mode . "linux"))))
+
+(use-package js-mode
+  :ensure nil
+  :hook (js-mode-hook . eglot-ensure)
+  :mode ("\\.webmanifest\\'" . js-mode))
+
+;; ADDTIONAL MODES
+(use-package flyspell
+  :config
+  ;;(add-hook 'text-mode-hook #'flyspell-mode)
+  ;;(add-hook 'prog-mode-hook #'flyspell-prog-mode)
+  (setq ispell-dictionary "en_US"))
+;;  :hook (text-mode . flyspell-mode))
+
 ;; (use-package company
 ;;   :init
 ;;   (global-company-mode))
@@ -67,8 +93,6 @@
   :config
   (add-hook 'typescript-mode-hook 'eglot-ensure))
 
-(add-hook 'js-mode-hook 'eglot-ensure)
-
 (use-package web-mode
   ;; :hook html-mode
   :mode (("\\.html?\\'" . web-mode)
@@ -104,13 +128,6 @@
 
 (use-package racket-mode)
 
-(use-package flyspell
-  :config
-  ;;(add-hook 'text-mode-hook #'flyspell-mode)
-  ;;(add-hook 'prog-mode-hook #'flyspell-prog-mode)
-  (setq ispell-dictionary "en_US"))
-;;  :hook (text-mode . flyspell-mode))
-
 (use-package markdown-mode)
 
 (use-package yaml-mode)
@@ -126,10 +143,6 @@
 
 (use-package pyvenv)
 
-(use-package js-mode
-  :ensure nil
-  :mode ("\\.webmanifest\\'" . js-mode))
-
 (use-package python
       :mode ("\\.py\\'" . python-mode)
             ("\\.wsgi$" . python-mode)
@@ -151,9 +164,3 @@
 (use-package yaml-mode)
 
 (use-package elpher)
-
-(use-package lisp-mode
-  :ensure nil
-  :mode (("\\.lisp$" . lisp-mode)
-         ("\\.lsp$" . lisp-mode)
-         ("\\.cl$" . lisp-mode)))