add new gpg defaults. And lumail2 is now just lumail.

2 files changed, 8 insertions, 4 deletions

diff --git a/config/lumail2/lumail2.lua b/config/lumail/lumail.lua
index 8c60232..ab8dbba 100644
--- a/config/lumail2/lumail2.lua
+++ b/config/lumail/lumail.lua
@@ -43,11 +43,13 @@ Config:set("global.name", "Florian Fischer")
 -- Default address.
 Config:set("global.address", "florian.fl.fischer@fau.de")
 -- Default From: address.
-Config:set( "global.sender", "Florian Fischer <florian.fl.fischer@fau.de>" )
+Config:set("global.sender", "Florian Fischer <florian.fl.fischer@fau.de>")
 -- Default sent-folder.
-Config:set( "global.sent-mail", HOME.."/Mail/FAU/Sent")
+Config:set("global.sent-mail", HOME.."/Mail/FAU/Sent")
 -- Default trash-folder.
-Config:set( "global.trash-mail", HOME.."/Mail/FAU/Trash")
+Config:set("global.trash-mail", HOME.."/Mail/FAU/Trash")
+-- Default GPG mode
+Config:set("gpg.mode", "auto")
 
 function on_folder_changed(folder)
     local path = folder:path()
@@ -56,11 +58,13 @@ function on_folder_changed(folder)
         Config:set("global.address", "florian.fl.fischer@fau.de")
         Config:set("global.sent-mail", HOME.."/Mail/FAU/Sent")
         Config:set( "global.trash-mail", HOME.."/Mail/FAU/Trash")
+        Config:set("gpg.mode", "auto")
     elseif path:find("MUHQ") then
         account = "muhq"
         Config:set("global.address", "florian.fischer@muhq.space")
         Config:set("global.sent-mail", HOME.."/Mail/MUHQ/Sent")
         Config:set( "global.trash-mail", HOME.."/Mail/MUHQ/Trash")
+        Config:set("gpg.mode", "")
     end
     -- update sender
     Config:set("global.sender", Config:get("global.name").." <"..Config:get("global.address")..">")
diff --git a/setup.py b/setup.py
index 6662334..33159f9 100755
--- a/setup.py
+++ b/setup.py
@@ -87,7 +87,7 @@ def offlineimap_warn(quiet):
 
 targets = {
         "lumail":
-            [("config/lumail2/lumail2.lua", home_dir + "/.config/lumail2/lumail2.lua")],
+            [("config/lumail/lumail.lua", home_dir + "/.config/lumail/lumail.lua")],
         "guixsd":
             [("guix/system.scm", "/etc/guix/system.scm"),
             ("guix/bashrc", home_dir + "/.bashrc")],