From ab38126575437ffdaf3cacfe3d279b8a7df87720 Mon Sep 17 00:00:00 2001
From: Filippo Berto <berto.f@protonmail.com>
Date: Sat, 23 Sep 2023 19:49:54 +0200
Subject: [PATCH] Switch from evolution to thunderbird

---
 flake.nix                        | 2 --
 instances/odin/hm.nix            | 3 ++-
 instances/thor/configuration.nix | 4 ++--
 instances/thor/hm.nix            | 3 ++-
 modules/nixos/sesar.nix          | 9 ---------
 5 files changed, 6 insertions(+), 15 deletions(-)
 delete mode 100644 modules/nixos/sesar.nix

diff --git a/flake.nix b/flake.nix
index 998639f..a231303 100644
--- a/flake.nix
+++ b/flake.nix
@@ -128,7 +128,6 @@
               ./instances/thor/configuration.nix
 
               ./modules/nixos/pro_audio.nix
-              ./modules/nixos/sesar.nix
               ./modules/nixos/kdeconnect.nix
             ] ++ homeManagerModules ++ [
               { home-manager.users.bertof = import ./instances/thor/hm.nix; }
@@ -150,7 +149,6 @@
               ./instances/odin/common_configuration.nix
 
               ./modules/nixos/pro_audio.nix
-              ./modules/nixos/sesar.nix
               ./modules/nixos/kdeconnect.nix
             ] ++ homeManagerModules ++ [
               { home-manager.users.bertof = import ./instances/odin/hm.nix; }
diff --git a/instances/odin/hm.nix b/instances/odin/hm.nix
index 9784b08..675d319 100644
--- a/instances/odin/hm.nix
+++ b/instances/odin/hm.nix
@@ -27,7 +27,7 @@
         droidcam
         easyeffects
         evince
-        evolution
+        # evolution
         gallery-dl
         geeqie
         google-chrome
@@ -46,6 +46,7 @@
         retroarchFull
         spotify
         tdesktop
+        thunderbird
         transmission-gtk
         virt-manager
         virt-viewer
diff --git a/instances/thor/configuration.nix b/instances/thor/configuration.nix
index 25cd707..837afa9 100644
--- a/instances/thor/configuration.nix
+++ b/instances/thor/configuration.nix
@@ -41,7 +41,7 @@ with lib; {
 
   environment = {
     pathsToLink = [ "/share/zsh" ];
-    systemPackages = builtins.attrValues { inherit (pkgs) helix tmux vim; };
+    systemPackages = builtins.attrValues { inherit (pkgs) git helix tmux vim; };
   };
 
   hardware = {
@@ -154,7 +154,7 @@ with lib; {
     #   daemon.enable = true;
     #   updater.enable = true;
     # };
-    dbus.packages = [ pkgs.dconf ];
+    dbus = { packages = [ pkgs.dconf ]; implementation = "broker"; };
     gnome.gnome-keyring.enable = true;
     gvfs = {
       enable = true;
diff --git a/instances/thor/hm.nix b/instances/thor/hm.nix
index 4d7f709..a929fc5 100644
--- a/instances/thor/hm.nix
+++ b/instances/thor/hm.nix
@@ -10,7 +10,7 @@
       inherit (pkgs)
         # electrum
         # element-desktop # matrix client
-        evolution
+        # evolution
         # freecad
         # minecraft
         # mycrypto
@@ -50,6 +50,7 @@
         retroarchFull
         spotify
         tdesktop
+        thunderbird
         transmission-gtk
         virt-manager
         virt-viewer
diff --git a/modules/nixos/sesar.nix b/modules/nixos/sesar.nix
deleted file mode 100644
index 73819d7..0000000
--- a/modules/nixos/sesar.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  networking = {
-    hosts = {
-      "172.20.28.210" = [ "datanode1" "datanode2" "datanode3" "namenode" ];
-      # "172.20.28.210" = [ "*.engine.sesar.int" ];
-      "159.149.147.137" = [ "vcenter.sesar.int" ];
-    };
-  };
-}