From d74a9ca049e654c99c942f0aa73dcc7afc716253 Mon Sep 17 00:00:00 2001
From: Alexander Bantyev <balsoft@balsoft.ru>
Date: Thu, 3 Jun 2021 18:15:00 +0300
Subject: [PATCH] Fix himalaya

---
 modules/applications/himalaya.nix | 36 +++++++++++++++----------------
 modules/overlay.nix               |  2 +-
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/modules/applications/himalaya.nix b/modules/applications/himalaya.nix
index 6ac8490..d8d4cf6 100644
--- a/modules/applications/himalaya.nix
+++ b/modules/applications/himalaya.nix
@@ -1,24 +1,22 @@
 { config, pkgs, inputs, lib, ... }: {
   environment.systemPackages = [ inputs.himalaya.defaultPackage.x86_64-linux ];
   home-manager.users.balsoft = {
-    xdg.configFile."himalaya/config.toml".text = pkgs.my-lib.genIni {
-      default = {
-        name = "Alexander Bantyev";
-        signature = "Regards,";
-        downloads-dir = "'/home/balsoft/Downloads/mail'";
-      };
-      maiol = {
-        default = true;
-        email = "balsoft@balsoft.ru";
-        imap-host = "balsoft.ru";
-        imap-login = "balsoft@balsoft.ru";
-        imap-passwd-cmd = "cat ${config.secrets.email.decrypted}";
-        imap-port = 993;
-        smtp-host = "balsoft.ru";
-        smtp-login = "balsoft@balsoft.ru";
-        smtp-passwd-cmd = "cat ${config.secrets.email.decrypted}";
-        smtp-port = 465;
-      };
-    };
+    xdg.configFile."himalaya/config.toml".text = ''
+      downloads-dir="/home/balsoft/Downloads/mail"
+      name="Alexander Bantyev"
+      signature="Regards,"
+
+      [balsoft]
+      default=true
+      email="balsoft@balsoft.ru"
+      imap-host="balsoft.ru"
+      imap-login="balsoft@balsoft.ru"
+      imap-passwd-cmd="cat /var/secrets/email"
+      imap-port=993
+      smtp-host="balsoft.ru"
+      smtp-login="balsoft@balsoft.ru"
+      smtp-passwd-cmd="cat /var/secrets/email"
+      smtp-port=465
+    '';
   };
 }
diff --git a/modules/overlay.nix b/modules/overlay.nix
index 77093a3..2bbfbc6 100644
--- a/modules/overlay.nix
+++ b/modules/overlay.nix
@@ -15,7 +15,7 @@ let
         value
       else
         builtins.toString value;
-    in "${key}=${mvalue}";
+    in ''${key}=${mvalue}'';
   attrsToList = with builtins;
     x:
     (map (key: {