From 3c7428c169d588a38377dc7e12d2eed328ff3843 Mon Sep 17 00:00:00 2001
From: Dmitriy Kholkin <ataraxiadev@ataraxiadev.com>
Date: Wed, 22 Nov 2023 06:08:41 +0300
Subject: [PATCH] geary as default mail client

---
 profiles/applications-setup.nix    |  4 --
 profiles/applications/email.nix    | 79 ++++++++++++++++++++++++++++++
 profiles/applications/himalaya.nix | 65 ------------------------
 3 files changed, 79 insertions(+), 69 deletions(-)
 create mode 100644 profiles/applications/email.nix
 delete mode 100644 profiles/applications/himalaya.nix

diff --git a/profiles/applications-setup.nix b/profiles/applications-setup.nix
index 35804fc..787a3bc 100644
--- a/profiles/applications-setup.nix
+++ b/profiles/applications-setup.nix
@@ -20,10 +20,6 @@
       cmd = "${pkgs.tdesktop}/bin/telegram-desktop";
       desktop = "telegram-desktop";
     };
-    # mail = {
-    #   cmd = "${pkgs.trojita}/bin/trojita";
-    #   desktop = "trojita";
-    # };
     # text_processor = {
     #   cmd = "${pkgs.libreoffice}/bin/libreoffice";
     #   desktop = "libreoffice";
diff --git a/profiles/applications/email.nix b/profiles/applications/email.nix
new file mode 100644
index 0000000..7291327
--- /dev/null
+++ b/profiles/applications/email.nix
@@ -0,0 +1,79 @@
+{ config, pkgs, lib, ... }: {
+
+  home-manager.users.${config.mainuser} = {
+    home.packages = [
+      # pkgs.himalaya
+      pkgs.gnome.geary
+    ];
+
+    # xdg.configFile."himalaya/config.toml".text = ''
+    #   downloads-dir = "/home/${config.mainuser}/Downloads/mail"
+    #   name = "Dmitriy Kholkin"
+    #   signature = "Regards,"
+    #   # email-reading-verify-cmd
+    #   # email-reading-decrypt-cmd
+    #   # email-writing-sign-cmd
+    #   # email-writing-encrypt-cmd
+    #   # notify-cmd
+    #   # notify-query
+    #   # sync
+
+    #   [ataraxiadev]
+    #   default = true
+    #   email = "ataraxiadev@ataraxiadev.com"
+
+    #   backend = "imap"
+    #   imap-host = "mail.ataraxiadev.com"
+    #   imap-port = 993
+    #   imap-login = "ataraxiadev@ataraxiadev.com"
+    #   imap-passwd-cmd = "${pkgs.pass}/bin/pass show email/ataraxiadev@ataraxiadev.com"
+    #   imap-ssl = true
+    #   imap-starttls = false
+    #   imap-insecure = false
+
+    #   sender = "smtp"
+    #   smtp-host = "mail.ataraxiadev.com"
+    #   smtp-port = 465
+    #   smtp-login = "ataraxiadev@ataraxiadev.com"
+    #   smtp-passwd-cmd = "${pkgs.pass}/bin/pass show email/ataraxiadev@ataraxiadev.com"
+    #   smtp-ssl = true
+    #   smtp-starttls = false
+    #   smtp-insecure = false
+    # '';
+  };
+
+  # systemd.user.services.himalaya-notify = {
+  #   description = "Himalaya new messages notifier";
+  #   after = [ "network.target" ];
+  #   wantedBy = [ "default.target" ];
+
+  #   script = "himalaya notify";
+  #   environment = {
+  #     PASSWORD_STORE_DIR = config.secretsConfig.password-store;
+  #     GNUPGHOME = config.secretsConfig.gnupgHome;
+  #   };
+  #   # script = "echo $(pass show email/ataraxiadev@ataraxiadev.com) || echo lol";
+  #   path = with pkgs; [ himalaya libnotify pass gnupg ];
+  #   serviceConfig = {
+  #     Restart = lib.mkForce "no";
+  #     # Restart = "always";
+  #     RestartSec = 10;
+  #     # Type = "oneshot";
+  #   };
+  # };
+
+  defaultApplications.mail = {
+    cmd = "${pkgs.gnome.geary}/bin/geary";
+    desktop = "geary";
+  };
+
+  startupApplications = [
+    config.defaultApplications.mail.cmd
+  ];
+
+  persist.state.homeDirectories = [
+    ".config/himalaya"
+    ".config/geary"
+    ".local/share/geary"
+  ];
+}
\ No newline at end of file
diff --git a/profiles/applications/himalaya.nix b/profiles/applications/himalaya.nix
deleted file mode 100644
index ad19742..0000000
--- a/profiles/applications/himalaya.nix
+++ /dev/null
@@ -1,65 +0,0 @@
-{ config, pkgs, lib, ... }: {
-
-  home-manager.users.${config.mainuser} = {
-    home.packages = [ pkgs.himalaya ];
-
-    xdg.configFile."himalaya/config.toml".text = ''
-      downloads-dir = "/home/${config.mainuser}/Downloads/mail"
-      name = "Dmitriy Kholkin"
-      signature = "Regards,"
-      # email-reading-verify-cmd
-      # email-reading-decrypt-cmd
-      # email-writing-sign-cmd
-      # email-writing-encrypt-cmd
-      # notify-cmd
-      # notify-query
-      # sync
-
-      [ataraxiadev]
-      default = true
-      email = "ataraxiadev@ataraxiadev.com"
-
-      backend = "imap"
-      imap-host = "mail.ataraxiadev.com"
-      imap-port = 993
-      imap-login = "ataraxiadev@ataraxiadev.com"
-      imap-passwd-cmd = "${pkgs.pass}/bin/pass show email/ataraxiadev@ataraxiadev.com"
-      imap-ssl = true
-      imap-starttls = false
-      imap-insecure = false
-
-      sender = "smtp"
-      smtp-host = "mail.ataraxiadev.com"
-      smtp-port = 465
-      smtp-login = "ataraxiadev@ataraxiadev.com"
-      smtp-passwd-cmd = "${pkgs.pass}/bin/pass show email/ataraxiadev@ataraxiadev.com"
-      smtp-ssl = true
-      smtp-starttls = false
-      smtp-insecure = false
-    '';
-  };
-
-  systemd.user.services.himalaya-notify = {
-    description = "Himalaya new messages notifier";
-    after = [ "network.target" ];
-    wantedBy = [ "default.target" ];
-
-    script = "himalaya notify";
-    environment = {
-      PASSWORD_STORE_DIR = config.secretsConfig.password-store;
-      GNUPGHOME = config.secretsConfig.gnupgHome;
-    };
-    # script = "echo $(pass show email/ataraxiadev@ataraxiadev.com) || echo lol";
-    path = with pkgs; [ himalaya libnotify pass gnupg ];
-    serviceConfig = {
-      Restart = lib.mkForce "no";
-      # Restart = "always";
-      RestartSec = 10;
-      # Type = "oneshot";
-    };
-  };
-
-  persist.state.homeDirectories = [
-    ".config/himalaya"
-  ];
-}
\ No newline at end of file