From 36abb35b7bde0da64d625c74dcd45f2cebb96c5b Mon Sep 17 00:00:00 2001 From: Tibo De Peuter Date: Fri, 20 Oct 2023 19:26:31 +0200 Subject: [PATCH] [thunderbird] Move into user config --- nixos/modules-old/apps/default.nix | 1 - .../modules-old/apps/thunderbird/default.nix | 130 ----------------- nixos/modules/users/tdpeuter/default.nix | 1 + nixos/modules/users/tdpeuter/mail.nix | 135 ++++++++++++++++++ 4 files changed, 136 insertions(+), 131 deletions(-) delete mode 100644 nixos/modules-old/apps/thunderbird/default.nix create mode 100644 nixos/modules/users/tdpeuter/mail.nix diff --git a/nixos/modules-old/apps/default.nix b/nixos/modules-old/apps/default.nix index d14f28e..3887b25 100644 --- a/nixos/modules-old/apps/default.nix +++ b/nixos/modules-old/apps/default.nix @@ -1,6 +1,5 @@ { imports = [ ./firefox - ./thunderbird ]; } diff --git a/nixos/modules-old/apps/thunderbird/default.nix b/nixos/modules-old/apps/thunderbird/default.nix deleted file mode 100644 index 7b4005f..0000000 --- a/nixos/modules-old/apps/thunderbird/default.nix +++ /dev/null @@ -1,130 +0,0 @@ -{ inputs, lib, config, pkgs, ... }: - -let - signatures = { - default = '' - Met vriendelijke groeten - Tibo De Peuter - ''; - UGent = '' - Met vriendelijke groeten - Tibo De Peuter - - Student 2Ba Informatica - ''; - MrFortem = '' - Kind regards - MrFortem Fiducia - ''; - }; -in -{ - home-manager.users.tdpeuter = { - accounts.email.accounts = { - Telenet = { - address = "tibo.depeuter@telenet.be"; - userName = "tibo.depeuter@telenet.be"; - imap = { - host = "imap.telenet.be"; - port = 993; - tls.enable = true; - }; - smtp = { - host = "smtp.telenet.be"; - port = 587; - tls = { - enable = true; - useStartTls = true; - }; - }; - - realName = "Tibo De Peuter"; - signature = { - showSignature = "append"; - text = signatures.default; - }; - - primary = true; - thunderbird = { - enable = true; - settings = id: { - "mail.identity.id_${id}.htmlSigText" = signatures.default; - }; - }; - }; - UGent = { - flavor = "outlook.office365.com"; - address = "tibo.depeuter@ugent.be"; - - realName = "Tibo De Peuter"; - signature = { - showSignature = "append"; - text = signatures.UGent; - }; - - thunderbird = { - enable = true; - settings = id: { - "mail.server.server_${id}.authMethod" = 10; - "mail.smtpserver.smtp_${id}.authMethod" = 10; - "mail.identity.id_${id}.htmlSigText" = signatures.UGent; - }; - }; - }; - Gmail = { - flavor = "gmail.com"; - address = "tibo.depeuter@gmail.com"; - - realName = "Tibo De Peuter"; - signature = { - showSignature = "append"; - text = signatures.default; - }; - thunderbird = { - enable = true; - settings = id: { - "mail.identity.id_${id}.htmlSigText" = signatures.default; - }; - }; - - }; - MrFortem = { - flavor = "gmail.com"; - address = "fortemfiducia@gmail.com"; - - realName = "Fortem Fiducia"; - signature = { - showSignature = "attach"; - text = '' - Kind regards - MrFortem Fiducia - ''; - }; - - thunderbird = { - enable = true; - settings = id: { - "mail.server.server_${id}.directory" = ".thunderbird/tdpeuter/ImapMail/imap.gmail.com-mrfortem"; - "mail.server.server_${id}.directory-rel" = "[ProfD]ImapMail/imap.gmail.com-mrfortem"; - "mail.identity.id_${id}.htmlSigText" = signatures.MrFortem; - }; - }; - }; - }; - - programs = { - thunderbird = { - enable = true; - profiles.tdpeuter = { - isDefault = true; - settings = { - "mailnews.default_sort_order" = 2; # Sort descending - "mailnews.mark_message_read.delay" = true; - "mailnews.start_page.enabled" = false; - "mail.pane_config.dynamic" = 2; # Vertical view - }; - }; - }; - }; - }; -} diff --git a/nixos/modules/users/tdpeuter/default.nix b/nixos/modules/users/tdpeuter/default.nix index 3e9b84d..2866f11 100644 --- a/nixos/modules/users/tdpeuter/default.nix +++ b/nixos/modules/users/tdpeuter/default.nix @@ -8,6 +8,7 @@ let in { imports = [ ./dotfiles.nix + ./mail.nix ./secrets.nix ]; diff --git a/nixos/modules/users/tdpeuter/mail.nix b/nixos/modules/users/tdpeuter/mail.nix new file mode 100644 index 0000000..4315f79 --- /dev/null +++ b/nixos/modules/users/tdpeuter/mail.nix @@ -0,0 +1,135 @@ +{ config, lib, pkgs, pkgs-unstable, ... }: + +let + cfg = config.sisyphus.users.tdpeuter; + user = config.users.users.tdpeuter.name; + signatures = { + default = '' + Met vriendelijke groeten + Tibo De Peuter + ''; + UGent = '' + Met vriendelijke groeten + Tibo De Peuter + + Student 2Ba Informatica + ''; + MrFortem = '' + Kind regards + MrFortem Fiducia + ''; + }; +in { + config = lib.mkIf cfg.enable { + home-manager.users.tdpeuter = lib.mkIf config.sisyphus.programs.home-manager.enable { + home = { + accounts.email.accounts = { + Telenet = { + address = "tibo.depeuter@telenet.be"; + userName = "tibo.depeuter@telenet.be"; + imap = { + host = "imap.telenet.be"; + port = 993; + tls.enable = true; + }; + smtp = { + host = "smtp.telenet.be"; + port = 587; + tls = { + enable = true; + useStartTls = true; + }; + }; + + realName = "Tibo De Peuter"; + signature = { + showSignature = "append"; + text = signatures.default; + }; + + primary = true; + thunderbird = { + enable = true; + settings = id: { + "mail.identity.id_${id}.htmlSigText" = signatures.default; + }; + }; + }; + UGent = { + flavor = "outlook.office365.com"; + address = "tibo.depeuter@ugent.be"; + + realName = "Tibo De Peuter"; + signature = { + showSignature = "append"; + text = signatures.UGent; + }; + + thunderbird = { + enable = true; + settings = id: { + "mail.server.server_${id}.authMethod" = 10; + "mail.smtpserver.smtp_${id}.authMethod" = 10; + "mail.identity.id_${id}.htmlSigText" = signatures.UGent; + }; + }; + }; + Gmail = { + flavor = "gmail.com"; + address = "tibo.depeuter@gmail.com"; + + realName = "Tibo De Peuter"; + signature = { + showSignature = "append"; + text = signatures.default; + }; + thunderbird = { + enable = true; + settings = id: { + "mail.identity.id_${id}.htmlSigText" = signatures.default; + }; + }; + + }; + MrFortem = { + flavor = "gmail.com"; + address = "fortemfiducia@gmail.com"; + + realName = "Fortem Fiducia"; + signature = { + showSignature = "attach"; + text = '' + Kind regards + MrFortem Fiducia + ''; + }; + + thunderbird = { + enable = true; + settings = id: { + "mail.server.server_${id}.directory" = ".thunderbird/tdpeuter/ImapMail/imap.gmail.com-mrfortem"; + "mail.server.server_${id}.directory-rel" = "[ProfD]ImapMail/imap.gmail.com-mrfortem"; + "mail.identity.id_${id}.htmlSigText" = signatures.MrFortem; + }; + }; + }; + }; + + programs = { + thunderbird = { + enable = true; + profiles.tdpeuter = { + isDefault = true; + settings = { + "mailnews.default_sort_order" = 2; # Sort descending + "mailnews.mark_message_read.delay" = true; + "mailnews.start_page.enabled" = false; + "mail.pane_config.dynamic" = 2; # Vertical view + }; + }; + }; + }; + }; + }; + }; +}