Adjustments for zeus and email

1 files changed, 24 insertions, 24 deletions

diff --git a/emacs.org b/emacs.org
index 65f9751..d5c6c72 100755
--- a/emacs.org
+++ b/emacs.org
@@ -559,7 +559,7 @@ Fonts and basic appearance settings for each device
 ** Org-drill
 #+begin_src emacs-lisp
   (when is-zeus
-    (load-file "~/Developer/org-drill/org-drill.el"))
+    (load-file "~/Developer/emacs-projects/org-drill/org-drill.el"))
   (setq org-drill-spaced-repetition-algorithm 'sm2
 	org-drill-learn-fraction 0.45
 	org-drill-maximum-items-per-session nil)
@@ -820,7 +820,7 @@ Create function to watch videos using ~mpv~
     (setq mu4e-contexts
 	  (list
 	   (make-mu4e-context
-	    :name "Personal"
+	    :name "Fastmail"
 	    :match-func
 	    (lambda (msg)
 	      (when msg
@@ -832,7 +832,7 @@ Create function to watch videos using ~mpv~
 		    (mu4e-refile-folder  . "/Archive")
 		    (mu4e-trash-folder  . "/Trash")))
 	   (make-mu4e-context
-	    :name "Master"
+	    :name "Public"
 	    :match-func
 	    (lambda (msg)
 	      (when msg
@@ -840,8 +840,8 @@ Create function to watch videos using ~mpv~
 	    :vars '((user-mail-address . "[email protected]")
 		    (user-full-name    . "Thanos Apollo")
 		    (smtpmail-smtp-server . "smtp.fastmail.com")
+		    (smtpmail-smtp-user . "[email protected]")
 		    (smtpmail-smtp-service . 465)
-		    (smtpmail-stream-type . ssl)
 		    (mu4e-drafts-folder  . "/Drafts")
 		    (mu4e-sent-folder  . "/Sent")
 		    (mu4e-refile-folder  . "/Archive")
@@ -851,7 +851,10 @@ Create function to watch videos using ~mpv~
 	  smtpmail-smtp-server "smtp.fastmail.com"
 	  smtpmail-smtp-service 465
 	  smtpmail-smtp-user "[email protected]"
-	  mu4e-compose-signature "Thanos Apollo\nhttps://thanosapollo.com")
+	  smtpmail-stream-type 'ssl
+	  mu4e-compose-signature "Thanos Apollo\nhttps://thanosapollo.com"
+	  mu4e-compose-context-policy 'ask-if-none
+	  mu4e-compose-format-flowed t)
 
     (setq mu4e-view-actions
 	  (delete-dups
@@ -1194,22 +1197,22 @@ Set aliases for emacs functions and ~PATH~
   (define-key thanos/vterm-map (kbd "d") 'multi-vterm-dedicated-open)
   (define-key thanos/vterm-map (kbd "o") 'multi-vterm)
 #+end_src
-* Circe
+* ERC
 #+begin_src emacs-lisp
-  (require 'circe)
-  (setq circe-network-options
-	`(("Libera Chat"
-	   :tls t
-	   :nick "thanosapollo"
-	   :sasl-username "thanosapollo"
-	   :sasl-password ,(password-store-get "liberachat/thanos_apollo")
-	   :channels ("#emacs-circe"
-		      "#emacs"
-		      "#debian"))))
+  ;;; Code:
+  (require 'erc)
+
+  (defun erc-libera ()
+    (interactive)
+    "Login to liberachat with erc."
+    (erc-tls :server "irc.libera.chat" :port 6697
+	     :nick "thanosapollo"
+	     :user "thanosapollo"
+	     :password (password-store-get "liberachat/thanos_apollo")))
 #+end_src
 ** Keybindings
 #+begin_src emacs-lisp
-  (define-key thanos/applications-map (kbd "i") 'circe)
+  (define-key thanos/applications-map (kbd "i") 'erc-libera)
 #+end_src
 * Chatgpt
 #+begin_src emacs-lisp
@@ -1219,10 +1222,11 @@ Set aliases for emacs functions and ~PATH~
 #+end_src
 * YeeTube
 #+begin_src emacs-lisp
-  (load-file "~/Developer/yeetube.el/yeetube.el")
+  (when is-zeus
+    (load-file "~/Developer/emacs-projects/yeetube.el/yeetube.el"))
 
   (setq yeetube-results-limit 15
-	yeetube-display-info-keys t)
+	yeetube-display-info-keys nil)
 
   (define-prefix-command 'thanos/yeetube)
   (global-set-key (kbd "C-c y") 'thanos/yeetube)
@@ -1351,13 +1355,9 @@ Set aliases for emacs functions and ~PATH~
   ;; 
 #+end_src
 
-
-
-
-
 ** App launcher
 #+begin_src emacs-lisp
-  (when (equal (load-file "~/Developer/emacs-app-launcher/app-launcher.el") t)
+  (when (equal (load-file "~/Developer/emacs-projects/emacs-app-launcher/app-launcher.el") t)
     (defun thanos/app-launcher ()
       (interactive)
       (let ((ivy-height 100))