getmail,msmtp: adapt for guix, guix: fix indent, add service-dovecot

diff --git a/.config/getmail/getmailrc b/.config/getmail/getmailrc
index e89702a..49170d1 100644 (file)
--- a/.config/getmail/getmailrc
+++ b/.config/getmail/getmailrc
@@ -2,14 +2,18 @@
 type = SimplePOP3SSLRetriever
 server = fencepost.gnu.org
 username = bandali
 type = SimplePOP3SSLRetriever
 server = fencepost.gnu.org
 username = bandali

-password_command = ("gpg", "--no-tty", "-q", "-d", "/home/amin/.passwd/gnu.gpg")
+password_command = ("gpg", "--no-tty", "-q", "-d", "/home/bandali/.passwd/gnu.gpg")

 port = 995
 use_apop = True
 
 [destination]
 port = 995
 use_apop = True
 
 [destination]

-type = MDA_external
-path = /usr/lib/dovecot/deliver
-arguments = ('-e', '-f', '%(sender)', '-d', 'bandali@gnu.local')
+type = Maildir
+path = ~/mail/gnu.local/bandali/mail/
+
+# [destination]
+# type = MDA_external
+# path = /usr/lib/dovecot/deliver
+# arguments = ('-e', '-f', '%(sender)', '-d', 'bandali@gnu.local')

 
 [options]
 read_all = false
 
 [options]
 read_all = false

diff --git a/.config/guix/system/chaman.scm b/.config/guix/system/chaman.scm
index 32ebe79..beddfa6 100644 (file)
--- a/.config/guix/system/chaman.scm
+++ b/.config/guix/system/chaman.scm
@@ -1,46 +1,63 @@
 (use-modules (gnu))
 (use-modules (gnu))

-(use-service-modules desktop networking ssh xorg)
+(use-service-modules desktop mail networking ssh xorg)

 
 (operating-system
   (host-name "chaman")
   (locale "en_CA.utf8")
   (timezone "America/Toronto")
   (keyboard-layout
 
 (operating-system
   (host-name "chaman")
   (locale "en_CA.utf8")
   (timezone "America/Toronto")
   (keyboard-layout

-    (keyboard-layout "us" "basic"))
+   (keyboard-layout "us" "basic"))

   (bootloader
   (bootloader

-    (bootloader-configuration
-      (bootloader grub-bootloader)
-      (target "/dev/sda")
-      (keyboard-layout keyboard-layout)))
+   (bootloader-configuration
+    (bootloader grub-bootloader)
+    (target "/dev/sda")
+    (keyboard-layout keyboard-layout)))

   (mapped-devices
   (mapped-devices

-    (list (mapped-device
-            (source
-              (uuid "3d9d579d-3626-4fb2-9c16-beae804f1cf9"))
-            (target "groot")
-            (type luks-device-mapping))))
+   (list (mapped-device
+          (source
+           (uuid "3d9d579d-3626-4fb2-9c16-beae804f1cf9"))
+          (target "groot")
+          (type luks-device-mapping))))

   (file-systems
   (file-systems

-    (cons* (file-system
-             (mount-point "/")
-             (device "/dev/mapper/groot")
-             (type "ext4")
-             (dependencies mapped-devices))
-           %base-file-systems))
+   (cons* (file-system
+            (mount-point "/")
+            (device "/dev/mapper/groot")
+            (type "ext4")
+            (dependencies mapped-devices))
+          %base-file-systems))

   (users (cons* (user-account
   (users (cons* (user-account

-                  (name "bandali")
-                  (group "users")
-                  (home-directory "/home/bandali")
-                  (supplementary-groups
-                    '("wheel" "netdev" "audio" "video")))
+                 (name "bandali")
+                 (group "users")
+                 (home-directory "/home/bandali")
+                 (supplementary-groups
+                  '("wheel" "netdev" "audio" "video")))

                 %base-user-accounts))
   (packages
                 %base-user-accounts))
   (packages

-    (append
-      (list (specification->package "nss-certs"))
-      %base-packages))
+   (append
+    (list (specification->package "nss-certs"))
+    %base-packages))

   (services
   (services

-    (append
-      (list (service xfce-desktop-service-type)
-            (service openssh-service-type)
-            (set-xorg-configuration
-              (xorg-configuration
-                (keyboard-layout keyboard-layout))))
-      %desktop-services)))
+   (append
+    (list (service xfce-desktop-service-type)
+          (service openssh-service-type)
+          (set-xorg-configuration
+           (xorg-configuration
+            (keyboard-layout keyboard-layout)))
+          (dovecot-service #:config
+                           (dovecot-configuration
+                            ;; (log-path "/dev/stderr")
+                            (protocols (list (protocol-configuration
+                                              (name "imap"))))
+                            (ssl? "no")
+                            (listen '("127.0.0.1"))
+                            (disable-plaintext-auth? #f)
+                            (auth-mechanisms '("plain"))
+                            (postmaster-address "bandali@gnu.local")
+                            (mail-location "maildir:/home/bandali/mail/%d/%n/mail")
+                            (userdbs (list (userdb-configuration
+                                            (driver "static")
+                                            (args (list "uid=bandali" "gid=users" "home=/home/bandali/mail/%d/%n")))))
+                            (passdbs (list (passdb-configuration
+                                            (driver "passwd-file")
+                                            (args (list "/home/bandali/.config/dovecot/passwd"))))))))
+    %desktop-services)))

diff --git a/.config/msmtp/config b/.config/msmtp/config
index fae1973..7f36e74 100644 (file)
--- a/.config/msmtp/config
+++ b/.config/msmtp/config
@@ -13,7 +13,7 @@ tls_fingerprint 2F:48:C6:F4:BA:AB:3F:52:84:06:56:33:4B:29:57:84:0F:74:1B:DB:C1:8
 tls_starttls on
 from amin@shemshak.org
 user amin@shemshak.org
 tls_starttls on
 from amin@shemshak.org
 user amin@shemshak.org

-passwordeval gpg2 --no-tty -q -d ~/.passwd/shemshak.gpg
+passwordeval gpg --no-tty -q -d ~/.passwd/shemshak.gpg

 
 account aminb : shemshak
 from amin@aminb.org
 
 account aminb : shemshak
 from amin@aminb.org


@@ -29,7 +29,7 @@ tls_fingerprint 13:CE:26:A2:60:33:FB:E0:B1:3E:91:06:AD:67:7A:A3:55:40:BA:04:80:D
 tls_starttls on
 from bandali@gnu.org
 user bandali
 tls_starttls on
 from bandali@gnu.org
 user bandali

-passwordeval gpg2 --no-tty -q -d ~/.passwd/gnu.gpg
+passwordeval gpg --no-tty -q -d ~/.passwd/gnu.gpg

 
 account gnu-aminb : gnu
 from aminb@gnu.org
 
 account gnu-aminb : gnu
 from aminb@gnu.org


@@ -43,7 +43,7 @@ host connect.uwaterloo.ca
 tls_starttls on
 from abandali@uwaterloo.ca
 user abandali
 tls_starttls on
 from abandali@uwaterloo.ca
 user abandali

-passwordeval gpg2 --no-tty -q -d ~/.passwd/uwaterloo.gpg
+passwordeval gpg --no-tty -q -d ~/.passwd/uwaterloo.gpg

 tls_trust_file /etc/ssl/certs/ca-certificates.crt
 
 account csclub
 tls_trust_file /etc/ssl/certs/ca-certificates.crt
 
 account csclub


@@ -51,7 +51,7 @@ host mail.csclub.uwaterloo.ca
 tls_starttls on
 from abandali@csclub.uwaterloo.ca
 user abandali
 tls_starttls on
 from abandali@csclub.uwaterloo.ca
 user abandali

-passwordeval gpg2 --no-tty -q -d ~/.passwd/csclub.gpg
+passwordeval gpg --no-tty -q -d ~/.passwd/csclub.gpg

 tls_trust_file /etc/ssl/certs/ca-certificates.crt
 
 # Set a default account
 tls_trust_file /etc/ssl/certs/ca-certificates.crt
 
 # Set a default account