From e9e5a00308e99d6e3050682edcf512b2fd5646b4 Mon Sep 17 00:00:00 2001 From: Natsu Kagami Date: Mon, 22 Apr 2024 11:57:42 +0200 Subject: [PATCH] Move back to thunderbird --- home/modules/linux/graphical/default.nix | 24 +++++++++++++++++++++-- home/modules/programs/my-sway/default.nix | 2 +- modules/common/linux/default.nix | 8 ++++---- 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/home/modules/linux/graphical/default.nix b/home/modules/linux/graphical/default.nix index 6ebea3d..5067b78 100644 --- a/home/modules/linux/graphical/default.nix +++ b/home/modules/linux/graphical/default.nix @@ -105,13 +105,33 @@ in xdg.mimeApps.enable = true; xdg.mimeApps.associations.added = { - "x-scheme-handler/mailto" = [ "org.gnome.Evolution.desktop" ]; + "x-scheme-handler/mailto" = [ "thunderbird.desktop" "org.gnome.Evolution.desktop" ]; "application/pdf" = [ "org.gnome.Evince.desktop" ]; "text/plain" = [ "kakoune.desktop" ]; + + # Other Thunderbird stuff + "x-scheme-handler/mid" = [ "thunderbird.desktop" ]; + "x-scheme-handler/news" = [ "thunderbird.desktop" ]; + "x-scheme-handler/snews" = [ "thunderbird.desktop" ]; + "x-scheme-handler/nntp" = [ "thunderbird.desktop" ]; + "x-scheme-handler/feed" = [ "thunderbird.desktop" ]; + "application/rss+xml" = [ "thunderbird.desktop" ]; + "application/x-extension-rss" = [ "thunderbird.desktop" ]; }; xdg.mimeApps.defaultApplications = { # Email - "x-scheme-handler/mailto" = [ "org.gnome.Evolution.desktop" ]; + "x-scheme-handler/mailto" = [ "thunderbird.desktop" "org.gnome.Evolution.desktop" ]; + "x-scheme-handler/webcal" = [ "thunderbird.desktop" ]; + "x-scheme-handler/webcals" = [ "thunderbird.desktop" ]; + + # Other Thunderbird stuff + "x-scheme-handler/mid" = [ "thunderbird.desktop" ]; + "x-scheme-handler/news" = [ "thunderbird.desktop" ]; + "x-scheme-handler/snews" = [ "thunderbird.desktop" ]; + "x-scheme-handler/nntp" = [ "thunderbird.desktop" ]; + "x-scheme-handler/feed" = [ "thunderbird.desktop" ]; + "application/rss+xml" = [ "thunderbird.desktop" ]; + "application/x-extension-rss" = [ "thunderbird.desktop" ]; # Default web browser stuff "text/html" = [ cfg.defaults.webBrowser ]; diff --git a/home/modules/programs/my-sway/default.nix b/home/modules/programs/my-sway/default.nix index d8f2724..242f113 100644 --- a/home/modules/programs/my-sway/default.nix +++ b/home/modules/programs/my-sway/default.nix @@ -157,7 +157,7 @@ in { command = "systemctl --user restart waybar"; always = true; } # Startup programs { command = "${cfg.browser}"; } - { command = "evolution"; } # Rely on system package with plugins + { command = "thunderbird"; } ] ++ (if cfg.discord != null then [ { command = "${cfg.discord}"; } ] ++ lib.lists.optional diff --git a/modules/common/linux/default.nix b/modules/common/linux/default.nix index bd47af5..6b98e6e 100644 --- a/modules/common/linux/default.nix +++ b/modules/common/linux/default.nix @@ -31,10 +31,10 @@ let environment.systemPackages = with pkgs.gnome; [ pkgs.glib gnome-control-center ]; services.accounts-daemon.enable = true; services.gnome.gnome-online-accounts.enable = true; - programs.evolution.enable = true; - programs.evolution.plugins = with pkgs; [ evolution-ews ]; - services.gnome.evolution-data-server.enable = true; - services.gnome.evolution-data-server.plugins = with pkgs; [ evolution-ews ]; + # programs.evolution.enable = true; + # programs.evolution.plugins = with pkgs; [ evolution-ews ]; + # services.gnome.evolution-data-server.enable = true; + # services.gnome.evolution-data-server.plugins = with pkgs; [ evolution-ews ]; }; wlr = { ... }: mkIf config.common.linux.enable {