4 files changed, 73 insertions, 50 deletions
diff --git a/home-manager/config/default.nix b/home-manager/config/default.nix
index 6b582094..c1ce60e8 100644
--- a/home-manager/config/default.nix
+++ b/home-manager/config/default.nix
@@ -8,6 +8,7 @@
     ./firefox
     ./gammastep
     ./git
+    ./gpg
     ./grades
     ./gtk
     ./himalaya
diff --git a/home-manager/config/git/default.nix b/home-manager/config/git/default.nix
index 5bb25c16..7e5f44ac 100644
--- a/home-manager/config/git/default.nix
+++ b/home-manager/config/git/default.nix
@@ -79,8 +79,8 @@
       helper = "cache --timeout 43200";
     };
     user = {
-      email = "ene@sils.li";
-      name = "ene";
+      email = "soispha@vhack.eu";
+      name = "Soispha";
     };
     help = {
       autocorrect = 5;
@@ -132,10 +132,10 @@ in {
         whitespace-error-style = "22 reverse";
       };
     };
-    #   signing = {
-    #      key = null; #let gpg2 decide, based on the author
-    #      signByDefault = true;
-    #    };
+    signing = {
+      key = "9606FC749FCE16360723D4ADA5E94010C3A642AD";
+      signByDefault = true;
+    };
   };
 }
 # vim: ts=2
diff --git a/home-manager/config/gpg/default.nix b/home-manager/config/gpg/default.nix
new file mode 100644
index 00000000..de6f7caa
--- /dev/null
+++ b/home-manager/config/gpg/default.nix
@@ -0,0 +1,20 @@
+{
+  config,
+  pkgs,
+  ...
+}: {
+  programs.gpg = {
+    enable = true;
+    homedir = "${config.xdg.dataHome}/gnupg/onlykey";
+    #mutableKeys = false;
+    #mutableTrust = false;
+    settings = {
+      # Hardware-based GPG configuration
+      agent-program =  "/home/soispha/.local/share/gnupg/onlykey/run-agent.sh";
+      default-key = "Soispha <soispha@vhack.eu>";
+      # TODO add more
+    };
+  };
+}
+# vim: ts=2
+
diff --git a/home-manager/config/mail/default.nix b/home-manager/config/mail/default.nix
index 31377b16..e44d2c33 100644
--- a/home-manager/config/mail/default.nix
+++ b/home-manager/config/mail/default.nix
@@ -1,49 +1,51 @@
-{...}: {
-  accounts.email.accounts = {
-    soispha = {
-      address = "soispha@vhack.eu";
-      #name = "soispha";
-      userName = "soispha";
-      realName = "Soispha";
-      primary = true;
-      passwordCommand = "secret-tool lookup account soispha@vhack.eu";
-      aliases = [
-        "admin@vhack.eu"
-      ];
-      folders = {
-      };
-      gpg = {
-        encryptByDefault = true;
-        key = ""; # TODO add
-        signByDefault = true;
-      };
-      signature = {
-        # TODO
-      };
-      neomutt = {
-        enable = true;
-      };
-      himalaya = {
-        enable = true;
-        backend = "imap";
-        sender = "smtp";
-        settings = {
+{config, ...}: {
+  accounts.email = {
+    maildirBasePath = "${config.xdg.dataHome}/maildir";
+    accounts = {
+      soispha = {
+        address = "soispha@vhack.eu";
+        userName = "soispha";
+        realName = "Soispha";
+        primary = true;
+        passwordCommand = "secret-tool lookup account soispha@vhack.eu";
+        aliases = [
+          "admin@vhack.eu"
+        ];
+        folders = {
+        };
+        gpg = {
+          encryptByDefault = true;
+          key = "9606FC749FCE16360723D4ADA5E94010C3A642AD";
+          signByDefault = true;
+        };
+        signature = {
           # TODO
         };
-      };
-      smtp = {
-        host = "smtp.vhack.eu";
-        port = 465;
-      };
-      imap = {
-        host = "imap.vhack.eu";
-        port = 993;
-      };
-      jmap = {
-        # TODO
-      };
-      maildir = {
-        path = "soispha";
+        neomutt = {
+          enable = true;
+        };
+        himalaya = {
+          enable = true;
+          backend = "imap";
+          sender = "smtp";
+          settings = {
+            # TODO
+          };
+        };
+        smtp = {
+          host = "smtp.vhack.eu";
+          port = 465;
+        };
+        imap = {
+          host = "imap.vhack.eu";
+          port = 993;
+        };
+        jmap = {
+          # TODO
+        };
+        maildir = {
+          path = "soispha";
+        };
       };
     };
   };