From 26a49acbc1f735e89dddef3f785ab3d48e40e904 Mon Sep 17 00:00:00 2001 From: punkfairie Date: Sat, 31 May 2025 17:40:10 -0700 Subject: [PATCH] feat: thunderbird --- modules/darwin/profiles.nix | 1 + modules/darwin/programs/default.nix | 1 + modules/darwin/programs/thunderbird.nix | 13 ++++++++ modules/home/profiles.nix | 1 + modules/home/programs/default.nix | 1 + modules/home/programs/thunderbird.nix | 31 +++++++++++++++++++ .../home/programs/gui/thunderbird/default.nix | 23 -------------- 7 files changed, 48 insertions(+), 23 deletions(-) create mode 100644 modules/darwin/programs/thunderbird.nix create mode 100644 modules/home/programs/thunderbird.nix delete mode 100644 snowflake/modules/home/programs/gui/thunderbird/default.nix diff --git a/modules/darwin/profiles.nix b/modules/darwin/profiles.nix index c38f957..ce0ee7a 100644 --- a/modules/darwin/profiles.nix +++ b/modules/darwin/profiles.nix @@ -8,6 +8,7 @@ in { nh = enabled; phpstorm = enabled; pidgin = enabled; + thunderbird = enabled; wezterm = enabled; wireguard = enabled; }; diff --git a/modules/darwin/programs/default.nix b/modules/darwin/programs/default.nix index c867457..263a2f4 100644 --- a/modules/darwin/programs/default.nix +++ b/modules/darwin/programs/default.nix @@ -5,6 +5,7 @@ ./nh.nix ./phpstorm.nix ./pidgin.nix + ./thunderbird.nix ./wezterm.nix ./wireguard.nix ]; diff --git a/modules/darwin/programs/thunderbird.nix b/modules/darwin/programs/thunderbird.nix new file mode 100644 index 0000000..249eec5 --- /dev/null +++ b/modules/darwin/programs/thunderbird.nix @@ -0,0 +1,13 @@ +{ + config, + lib, + ... +}: let + cfg = config.marleyos.programs.thunderbird; +in { + options.marleyos.programs.thunderbird.enable = lib.mkEnableOption "thunderbird"; + + config = lib.mkIf cfg.enable { + homebrew.casks = ["thunderbird"]; + }; +} diff --git a/modules/home/profiles.nix b/modules/home/profiles.nix index 4dbe624..0134b65 100644 --- a/modules/home/profiles.nix +++ b/modules/home/profiles.nix @@ -64,6 +64,7 @@ in { pidgin = enabled; superfile = enabled; tea = enabled; + thunderbird = enabled; }; services = { diff --git a/modules/home/programs/default.nix b/modules/home/programs/default.nix index dd5aa68..b745560 100644 --- a/modules/home/programs/default.nix +++ b/modules/home/programs/default.nix @@ -43,6 +43,7 @@ ./superfile.nix ./systemctl.nix ./tea.nix + ./thunderbird.nix ./tmux.nix ./waybar.nix ./wget.nix diff --git a/modules/home/programs/thunderbird.nix b/modules/home/programs/thunderbird.nix new file mode 100644 index 0000000..30c91e0 --- /dev/null +++ b/modules/home/programs/thunderbird.nix @@ -0,0 +1,31 @@ +{ + marleylib, + config, + osConfig, + lib, + pkgs, + ... +}: let + inherit (marleylib.module) mkEnableOption'; + + cfg = config.marleyos.programs.thunderbird; + osCfg = osConfig.marleyos.programs.thunderbird.enable or false; +in { + options.marleyos.programs.thunderbird.enable = + mkEnableOption' "thunderbird" osCfg; + + config = lib.mkIf cfg.enable { + programs.thunderbird = { + enable = true; + package = lib.mkIf pkgs.stdenv.isDarwin pkgs.emptyDirectory; + + settings = { + "privacy.donottrackheader.enabled" = true; + }; + + profiles."${config.marleycfg.my.name}" = { + isDefault = true; + }; + }; + }; +} diff --git a/snowflake/modules/home/programs/gui/thunderbird/default.nix b/snowflake/modules/home/programs/gui/thunderbird/default.nix deleted file mode 100644 index ff83549..0000000 --- a/snowflake/modules/home/programs/gui/thunderbird/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - lib, - config, - ... -}: let - cfg = config.marleyos.programs.thunderbird; -in { - options.marleyos.programs.thunderbird.enable = lib.mkEnableOption "thunderbird"; - - config = lib.mkIf cfg.enable { - programs.thunderbird = { - enable = true; - - settings = { - "privacy.donottrackheader.enabled" = true; - }; - - profiles."${config.marleyos.my.name}" = { - isDefault = true; - }; - }; - }; -}