.

1 files changed, 20 insertions, 33 deletions

diff --git a/home/dots/.emacs b/home/dots/.emacs
index 5ffe486..c651efb 100644
--- a/home/dots/.emacs
+++ b/home/dots/.emacs
@@ -49,7 +49,8 @@
   (unless (package-installed-p package)
     (package-install package)))
 
-(load-theme 'BOGO t)
+(load-theme 'BOGO-dark t)
+
 
 (use-package exwm
   :init
@@ -209,7 +210,7 @@
 
 (use-package tab-bar
   :custom
-  (tab-bar-auto-width t)
+  (tab-bar-auto-width nil)
   (tab-bar-close-button-show nil)
   (tab-bar-format
    '(tab-bar-format-tabs tab-bar-format-align-right tab-bar-format-global))
@@ -988,7 +989,7 @@
   (org-id-link-to-org-use-id 'create-if-interactive-and-no-custom-id))
 
 (use-package ol
-  :after org-compat org-macs org-fold
+  :after (org-compat org-macs org-fold)
   :bind
   (("C-c l" . org-store-link)))
 
@@ -1067,7 +1068,6 @@
   (advice-add 'org-agenda-quit :before (lambda ()
 					 (interactive)
 					 (org-save-all-org-buffers)
-					 (org-id-update-id-locations)
 					 (sync-org)))
   :bind
   (("C-c a" . org-agenda)
@@ -1082,7 +1082,7 @@
   :ensure nil)
 
 (use-package appt
-  :after org-agenda
+  :after (org-agenda dbus)
   :demand t
   ;; Taken from https://igormelo.org/you_dont_need_org_alert.html
   ;; Enables notifications for org
@@ -1138,9 +1138,9 @@
 
   (define-skeleton golang-if-nil-err
     "If err != nil" nil
-   > "if err != nil {" \n
-   @ - \n
-     -1 "}")
+    > "if err != nil {" \n
+    @ - \n
+    -1 "}")
 
   (define-skeleton golang-new-struct
     "New struct"
@@ -1151,12 +1151,13 @@
   
   (define-skeleton golang-for-loop
     "For loop"
-   > "for _, v := range " - @ "{" \n
-   \n
-     -1 "}"))
+    > "for _, v := range " - @ "{" \n
+    \n
+    -1 "}"))
 
 (use-package abbrev
-  :after skeleton go-mode
+  :after (skeleton go-mode)
+  :diminish abbrev-mode
   :init
   (setq-default abbrev-mode t)
   :config
@@ -1167,8 +1168,7 @@
   (define-abbrev go-mode-abbrev-table "2st"
     "" 'golang-new-struct)
   (define-abbrev go-mode-abbrev-table "2fo"
-    "" 'golang-for-loop)
-  )
+    "" 'golang-for-loop))
 
 (use-package flyspell
   :diminish flyspell-mode
@@ -1183,8 +1183,6 @@
 (use-package simple
   :diminish visual-line-mode)
 
-
-
 (use-package message
   :custom
   (message-expand-name-standard-ui t)
@@ -1194,9 +1192,7 @@
   (message-citation-line-function 'message-insert-formatted-citation-line)
   (message-mail-alias-type 'ecomplete)
   (message-self-insert-commands nil)
-  (message-send-mail-function 'sendmail-send-it)
-  (message-kill-buffer-on-exit t)
-  (message-sendmail-envelope-from 'header))
+  (message-kill-buffer-on-exit t))
 
 (use-package sendmail
   :defer t
@@ -1210,10 +1206,9 @@
   (message-sendmail-f-is-evil t)
   (message-sendmail-extra-arguments '("--read-envelope-from"))
   (message-send-mail-function 'message-send-mail-with-sendmail)
+  (message-sendmail-envelope-from 'header)
   (mail-user-agent 'message-user-agent))
 
-(use-package tempo)
-
 (use-package rmail
   :init
   (defvar selected-rmail-account "")
@@ -1241,11 +1236,7 @@
   (defun mail-work ()
     (interactive)
     (setq
-     rmail-primary-inbox-list (list (concat "imaps://"
-					    "marc.coquand%40piva.earth"
-					    ":"
-					    piva-password
-					    "@imap.gmail.com:993"))
+     rmail-primary-inbox-list (list (concat "imaps://" "marc.coquand%40piva.earth" ":" piva-password "@imap.gmail.com:993"))
      rmail-default-file "~/personal-db/mail/work/RMAIL"
      rmail-remote-password-required nil
      rmail-preserve-inbox nil
@@ -1264,11 +1255,7 @@
      rmail-default-file "~/personal-db/mail/home/RMAIL"
      rmail-remote-password-required nil
      rmail-preserve-inbox nil
-     rmail-primary-inbox-list (list (concat "imaps://"
-					    "marcc%40fastmail.fr"
-					    ":"
-					    fastmail-password
-					    "@imap.fastmail.com:993"))
+     rmail-primary-inbox-list (list (concat "imaps://" "marcc%40fastmail.fr" ":" fastmail-password "@imap.fastmail.com:993"))
      rmail-secondary-file-regexp "~/personal-db/mail/home/archives/*.mbox"
      rmail-output-file-alist '(("\\[PATCH.*\\]" . "patch.mbox")
 			       ("[rR]eceipt"        . "receipt.mbox")
@@ -1295,7 +1282,7 @@
       (tmm-prompt rmail-prompt-account)
       (unless (eq selected-rmail-account prev)
 	;; First kill all RMAIL buffers to not leave any dangling
-	(kill-matching-buffers "\\.mbox\\|RMAIL")))
+	(kill-matching-buffers "\\.mbox\\|^RMAIL")))
     (rmail-no-check))
 
   (defun rmail-open ()
@@ -1304,7 +1291,7 @@
       (tmm-prompt rmail-prompt-account)
       (unless (eq selected-rmail-account prev)
 	;; First kill all RMAIL buffers to not leave any dangling
-	(kill-matching-buffers "\\.mbox\\|RMAIL")))
+	(kill-matching-buffers "\\.mbox\\|^RMAIL")))
     (rmail))
   :custom
   (rmail-mime-prefer-html nil)