emacs

2 files changed, 42 insertions, 5 deletions

diff --git a/emacs b/emacs
index 1a7e823..51563ab 100644
--- a/emacs
+++ b/emacs
@@ -8,11 +8,11 @@
 (pixel-scroll-precision-mode)
 (delete-selection-mode 1)
 (fset 'yes-or-no-p 'y-or-n-p)
-(setq initial-scratch-message ";; scratch")
+(setq initial-scratch-message "")
 (setq-default frame-title-format '("%b"))
 (setq ring-bell-function 'ignore)
 (setq inhibit-startup-screen t)
-(setq line-spacing 0.15)
+(setq line-spacing 0.2)
 
 
 ;; Put Emacs auto-save and backup files to /tmp
@@ -72,6 +72,11 @@
 
 ;; Pairs
 (electric-pair-mode 1)
+(global-set-key (kbd "M-{") 'insert-pair)
+(global-set-key (kbd "M-\"") 'insert-pair)
+(global-set-key (kbd "M-\'") 'insert-pair)
+(global-set-key (kbd "M-<") 'insert-pair)
+(global-set-key (kbd "M-[") 'insert-pair)
 
 ;; IDO
 (ido-mode t)
@@ -127,7 +132,25 @@
 	mastodon-active-user "marcc"
 	mastodon-instance-url "https://fosstodon.org")
 
+
+
 ;; Mu4e
+(defun marc/set-msmtp-account ()
+  (if (message-mail-p)
+      (save-excursion
+        (let*
+            ((from (save-restriction
+                     (message-narrow-to-headers)
+                     (message-fetch-field "from")))
+             (account
+              (cond
+               ((string-match "marcc@fastmail.fr" from) "home")
+               ((string-match "marc.coqxuand@sustainably.app" from) "work")
+               ((string-match "marc@mccd.space" from) "home"))))
+          (setq message-sendmail-extra-arguments (list '"-a" account))))))
+
+(add-hook 'message-send-mail-hook 'marc/set-msmtp-account)
+
 (use-package mu4e
   :ensure nil
   :load-path "/usr/share/emacs/site-lisp/mu4e/"
@@ -135,7 +158,21 @@
 
   ;; This is set to 't' to avoid mail syncing issues when using mbsync
   (setq mu4e-change-filenames-when-moving t)
+  
+  ;; don't keep message compose buffers around after sending:
+  (setq message-kill-buffer-on-exit t)
 
+  ;; send function:
+  (setq send-mail-function 'sendmail-send-it
+	message-send-mail-function 'sendmail-send-it)
+
+  ;; send program:
+  ;; this is exeranal. remember we installed it before.
+  (setq sendmail-program (executable-find "msmtp"))
+
+  ;; select the right sender email from the context.
+  (setq message-sendmail-envelope-from 'header)  
+    
   ;; Refresh mail using isync every 10 minutes
   (setq mu4e-update-interval (* 10 60)
         mu4e-get-mail-command "mbsync -a"
@@ -143,7 +180,6 @@
 	mu4e-view-show-addresses t
 	mu4e-attachment-dir "~/Downloads"
 	mu4e-view-prefer-html t
-	message-send-mail-function 'smtpmail-send-it
 	mu4e-maildir "~/mail")
 
   (setq mu4e-contexts
@@ -163,6 +199,7 @@
                   (mu4e-sent-folder  . "/home/Sent")
                   (mu4e-refile-folder  . "/home/Archive")
                   (mu4e-trash-folder  . "/home/Trash")
+
 		  (mu4e-maildir-shortcuts .
 					  (("/home/INBOX" . ?i)
 					   ("/home/Archive/Done" . ?d)
@@ -206,7 +243,7 @@
  '(font-lock-type-face ((t (:foreground "black"))))
  '(font-lock-variable-name-face ((t (:foreground "black"))))
  '(header-line ((t (:inherit mode-line :background "white" :foreground "grey20" :box nil :underline "black"))))
- '(highlight ((t (:background "light yellow"))))
+ '(highlight ((t (:background "white smoke"))))
  '(mastodon-display-name-face ((t (:inherit nil :weight bold))))
  '(mode-line ((t (:background "white" :foreground "black" :box (:line-width (1 . -1) :style flat-button) :overline "black"))))
  '(mu4e-header-highlight-face ((t (:inherit hl-line :extend t :weight bold))))
diff --git a/xinitrc b/xinitrc
index a24a754..5f5039e 100755
--- a/xinitrc
+++ b/xinitrc
@@ -4,7 +4,7 @@ xrdb -load ~/.Xresources &
 autocutsel &
 xsetroot -solid '#282C34' &
 ulimit -c 0 &
-xclock -digital -geometry +1150+1402 -face "Iosevka Aile:pixelsize=18:style=regular" -bg \#282C34 -fg \#B8BCC4 -strftime "Bogo (%Y/%m/%d) %H:%M" &
+xclock -digital -geometry +5+1402 -face "Iosevka Aile:pixelsize=18:style=regular" -bg \#282C34 -fg \#B8BCC4 -strftime "Bogo (%Y/%m/%d) %H:%M" &
 gsettings set org.gnome.desktop.interface document-font-name 'Iosevka Aile' &
 gsettings set org.gnome.desktop.interface font-name 'Iosevka Aile' &
 gsettings set org.gnome.desktop.interface cursor-size 32 &