restructure passwords

msmtp/.msmtprc

@@ -13,6 +13,6 @@ host           mail.fsfe.org
 port           587
 from           max.mehl@fsfe.org
 user           max.mehl
-passwordeval   pass Mail/FSFE-SMTP
+passwordeval   pass Mail/SMTP-FSFE
 
 account default : fsfe

offlineimap/.offlineimap/getpass.py

@@ -2,4 +2,4 @@
 from subprocess import check_output
 
 def get_pass(account):
-    return check_output("pass Mail/" + account, shell=True).splitlines()[0]
+    return check_output("pass " + account, shell=True).splitlines()[0]

offlineimap/.offlineimaprc

@@ -28,5 +28,5 @@ type = IMAP
 remotehost = machholz.uberspace.de
 remoteuser = fsfe@ext2.mehl.mx
 sslcacertfile = /etc/ssl/certs/ca-certificates.crt
-remotepasseval = get_pass("FSFE")
+remotepasseval = get_pass("Mail/IMAP-FSFE")
 maxconnections = 4

pass/.password-store/.gpg-id

@@ -1 +0,0 @@
-96FE8C4B

pass/.password-store/FSFE

@@ -1 +0,0 @@
-/home/max/Repositories/fsfe/passwords/

pass/Mail/.gpg-id

@@ -0,0 +1 @@
+E1DD1B5507036B458144104CDA0040918C702037

vdirsyncer/config

@@ -47,4 +47,4 @@ url = "https://d.mehl.mx/baikal/html/dav.php/addressbooks"
 username = "mxmehl"
 # The password can also be fetched from the system password storage, netrc or a
 # custom command. See http://vdirsyncer.pimutils.org/en/stable/keyring.html
-password.fetch = ["command", "pass", "DAV/Baikal-mxmehl"]
+password.fetch = ["command", "pass", "Mail/Baikal-mxmehl"]