Update channel configuration, .emacs, mail setup, packagesmain

3 files changed, 30 insertions, 26 deletions

diff --git a/.emacs b/.emacs
index 70de4a8..02edd24 100644
--- a/.emacs
+++ b/.emacs
@@ -17,6 +17,7 @@
  '(user-full-name "Charles Roelli")
  '(user-mail-address "charles@aurox.ch")
  '(vc-make-backup-files t)
+ '(version-control t)
  '(visible-bell t))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
@@ -29,5 +30,3 @@
 
 (require 'ansi-color)
 (add-hook 'compilation-filter-hook 'ansi-color-compilation-filter)
-
-(ffap-bindings)
diff --git a/.password-store/smtpd.gpg b/.password-store/smtpd.gpg
index d034e75..9a1342b 100644
--- a/.password-store/smtpd.gpg
+++ b/.password-store/smtpd.gpg
@@ -1,17 +1,17 @@
 -----BEGIN PGP MESSAGE-----
 
-hQIMAwAAAAAAAAAAAQ//Rzfu247sulkBFtg6DFse6EN8kMwSAw+uVna/tHgPf/Rd
-NMilJk/ctOA1YblgHEjkkVBI1hWe8kyK8mi9RoI5nGbmHHKW/NC7i2IUOjRIaIBK
-KQxFaeUcKHJq6KJ9+8lPz4Y0E40OVbqeXPuV0qhYXFZXnQtLb8kCukigPYX/6eqW
-IV/3SDB+EEI4fRC2tg1sbi9EBir9ZPdjiPhyAn9wWREe7xM/DOPuWLCyTij+Ee/j
-gzPldoindFEfwJpigE/tz63FtvQhqMjNbxoKm4tYRT6vhWHpW2f1lPS7PSpzTjNZ
-0+Vug5kMefi7CpIoplpAN9XKWTCdZAuDhzjhMkWvpRnZ2rPgLCyWrIdQ7u9xvdQK
-rQ2/1u4hDECgJ9nZrnN/2TC517JI3X+Sr2vqbbqTTp5BmGlkOFyCU/570ubJMl8f
-m6xFSm/iyngPv3dhCZq87b3i13Xvs/KfrZCf7Gzjkhgw8Dp7bbSBZvFdiY+1m3HX
-Flt48fbeJxrCvl6KA4f1iV5Bg9pXUtaj6qYokOpT8Bejz6ZkEYFBm+cTq1HrTXVN
-2sYONTsB+2sg58El9JJKWeP2hWSFf638VTDp7hbZNxYmLoc78J2oce+Zx9wVqUjY
-IsA5No8eSMA1h2NfHUX/e5+k7JhOmEdLDbiKbi+yUcBwkKFtHz2LPkwUNuGK0R/S
-QgHEWTfRh2koyXnkWh2KZ/vFkeWfWVlAdaiwDORq0HKjkjJ1X8OlLgEXlJEGwL/3
-6XWYmJ2x6/U9xgOjd5L7B0yMiA==
-=gGep
+hQIMAwAAAAAAAAAAAQ/8DxRU+NcoQOvtCtruAdVfjaxete46SbFhJv03uo6BrzqG
+z4IV3pOXFLpM/4bRDc4TRQtjDjAAJxwW93Pik1PIo3gdExOonYEcRnRtikc8fhoB
+R6O4Pt5JMqGWSiBWo+h0KjO9eIdChvbhdLHQqBAnpXNzjizI7iOTy1y/16oFNblG
+tsbpx2K/4cwcXBsF9bCzCFhMa6ujrw1fXJbfXQTcvO9VHItUR2SxiTBNrbkK1mck
+Be60rU2E3WQTfgUB7NM4dPN1sJWmvVK0/NEWRoP2vGKVk8J14qZ2nJMOmV8VxqKh
+zTfnbkcV1nAEeLeAoKmiWr5BNVGR1ffM9x0nmQqKc8qU+MZ79QKL/0pneZ5kfvNq
+ysAWIo+wZPXhfG5q+cY6IEtxTnAb+UAVNorhltHRjrMbyGdMNcO0BANiyp2TvQPF
+eoc7bfkgrBB1YW1xtsx23TcyVy/7xb+Jv7XHRDqIqRRdvaBAJqYtoDGJbKlgOfW5
+QBLhWoyPXVNDqTyALp+3O0FLdyO27Hqnz6NZPEYJhlclIc8bp2jZ8SYJQsSqpqVP
+g4DXGdZqr66z5LyWe34JKOY00qFLbwKAkejLN926wq3Ep/nMA9wktDvR7C9yJrAZ
+05BAQmtQeSlDVSas/1qVdMTuS64QPB4HOxduM3644ADNgfg8cT0a8eai60Ew1YbS
+UgHH/2cEfAuhRT2FoTZFzL8ek3kW6vVIj8TXgxUqS89/aFMXEZTDeh+tkyH6t46a
+depXM+b9POhd3m1h0myxbjI6RfIZ07AA2RPGvovXL9iJnfE=
+=UDpa
 -----END PGP MESSAGE-----
diff --git a/home-configuration.scm b/home-configuration.scm
index f88fe76..e937117 100644
--- a/home-configuration.scm
+++ b/home-configuration.scm
@@ -50,26 +50,25 @@
 		   (accounts
 		    (list
 		     (msmtp-account
-		       (name "charles@aurox.ch")
+		       (name "charles")
 		       (configuration
 			(msmtp-configuration
 			  (auth? #t)
 			  (tls? #t)
-			  (tls-starttls? #f)
-			  (log-file "/home/charles/log/mail/charles@aurox.ch.log")
-			  (from "charles@aurox.ch")
-			  (host "smtp.migadu.com")
-			  (port 465)
-			  (user "charles@aurox.ch")
-			  (password-eval "pass charles@aurox.ch"))))))
-		   (default-account "charles@aurox.ch")))
+			  (tls-starttls? #t)
+			  (log-file "/home/charles/log/mail/charles.log")
+			  (host "occam.adnoto.dev")
+			  (port 587)
+			  (user "charles")
+			  (password-eval "pass smtpd"))))))
+		   (default-account "charles")))
 	(simple-service 'variant-packages-service
 			home-channels-service-type
 			(list
 			 (channel
 			   (name 'variant-packages)
 			   (branch "main")
-			   (url "https://codeberg.org/charlesroelli/channel.git")
+			   (url "https://cgit.adnoto.dev/git/channel.git")
 			   (introduction
 			    (make-channel-introduction
 			     "ffc27e1f5f8306faf47098e8cf8e06c610a315de"
@@ -86,10 +85,16 @@
 	  "emacs-auctex"
 	  "emacs-geiser"
 	  "emacs-geiser-guile"
+	  "emacs-jabber"
 	  "emacs-ledger-mode"
+	  "emacs-markdown-mode"
+	  "emacs-nov"
 	  "glibc-locales"
 	  "guile"
+	  "mailutils"
+	  "m4"
 	  "password-store"
+	  "ripgrep"
 
 	  ;; TeX setup from https://guix.gnu.org/manual/1.5.0/en/html_node/Using-TeX-and-LaTeX.html
 	  "rubber"