From a905052dd17047e387255c88de1bfbaea6a3dd2f Mon Sep 17 00:00:00 2001
From: Alexander Bantyev <balsoft@balsoft.ru>
Date: Fri, 28 Feb 2020 17:23:15 +0300
Subject: [PATCH] Update modules/applications/sylpheed.nix
 modules/applications/trojita.nix modules/default.nix
 modules/workspace/i3/default.nix

---
 modules/applications/sylpheed.nix | 2 +-
 modules/applications/trojita.nix  | 1 +
 modules/default.nix               | 3 ++-
 modules/workspace/i3/default.nix  | 1 -
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/applications/sylpheed.nix b/modules/applications/sylpheed.nix
index 751c4cd..9eccda3 100644
--- a/modules/applications/sylpheed.nix
+++ b/modules/applications/sylpheed.nix
@@ -19,7 +19,7 @@
       nntp_server=
       use_nntp_auth=0
       user_id=balsoft@balsoft.ru
-      password=${config.secrets.email.password}
+      password=${config.secrets.mail.password}
       inbox=inbox
       use_apop_auth=0
       remove_mail=1
diff --git a/modules/applications/trojita.nix b/modules/applications/trojita.nix
index 6058fa7..0454623 100644
--- a/modules/applications/trojita.nix
+++ b/modules/applications/trojita.nix
@@ -1,5 +1,6 @@
 { pkgs, config, lib, ... }:
 with import ../../support.nix { inherit lib config; }; {
+  home-manager.users.balsoft.xsession.windowManager.i3.config.startup = [ { command = "${pkgs.trojita}/bin/trojita"; } ];
   home-manager.users.balsoft.xdg.configFile."flaska.net/trojita.conf".text =
   if !isNull config.secrets.mail then
     genIni {
diff --git a/modules/default.nix b/modules/default.nix
index 80a1e9c..8562075 100755
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -4,7 +4,8 @@ device:
     ./applications/packages.nix
     ./applications/emacs
     ./applications/konsole.nix
-    ./applications/trojita.nix
+    # ./applications/trojita.nix
+    ./applications/sylpheed.nix
     ./applications/weechat.nix
     ./applications/okular.nix
     ./applications/yt-utilities.nix
diff --git a/modules/workspace/i3/default.nix b/modules/workspace/i3/default.nix
index f7d23f3..de8a7c3 100755
--- a/modules/workspace/i3/default.nix
+++ b/modules/workspace/i3/default.nix
@@ -82,7 +82,6 @@ in {
           command =
             "${pkgs.keepassxc}/bin/keepassxc /home/balsoft/projects/nixos-config/misc/Passwords.kdbx";
         }
-        { command = "${pkgs.trojita}/bin/trojita"; }
         { command = "${pkgs.termNote}/bin/noted"; }
         { command = "${pkgs.nheko}/bin/nheko"; }
         { command = "${pkgs.xorg.xrdb}/bin/xrdb -merge ~/.Xresources"; }