From 53f787d6c89d9a6c2b368fd0b9acebb69cd94a7a Mon Sep 17 00:00:00 2001
From: GarandPLG <garandplg@garandplg.com>
Date: Sun, 8 Feb 2026 13:10:11 +0100
Subject: [PATCH] Enable Evolution module and bind shortcut
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add core/evolution.nix with a toggleable option and import it in the
core
defaults. Enable the option on desktop, laptop, and default hosts.
Remove
the duplicated evolution‑data‑server enable flag from services.nix. Add
a
Hyprland keybinding (Super Shift E) to launch Evolution.
---
 hosts/Garand-Desktop/system-modules.nix |  5 +++++
 hosts/Garand-Laptop/system-modules.nix  |  5 +++++
 hosts/default/system-modules.nix        |  5 +++++
 modules/core/default.nix                |  1 +
 modules/core/evolution.nix              | 12 ++++++++++++
 modules/core/packages/programs.nix      |  1 -
 modules/core/services.nix               |  5 +----
 modules/home/hyprland/binds.nix         |  1 +
 8 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 modules/core/evolution.nix

diff --git a/hosts/Garand-Desktop/system-modules.nix b/hosts/Garand-Desktop/system-modules.nix
index 9b03d27..25a0bca 100644
--- a/hosts/Garand-Desktop/system-modules.nix
+++ b/hosts/Garand-Desktop/system-modules.nix
@@ -18,6 +18,11 @@ _: {
   */
   tailscale.enable = true; # Tailscale: secure network for remote access
 
+  /*
+  Calendar & Contacts
+  */
+  evolution.enable = true; # Evolution: calendar and contacts application
+
   /*
   Gaming
   */
diff --git a/hosts/Garand-Laptop/system-modules.nix b/hosts/Garand-Laptop/system-modules.nix
index 5a73185..cef8b00 100644
--- a/hosts/Garand-Laptop/system-modules.nix
+++ b/hosts/Garand-Laptop/system-modules.nix
@@ -18,6 +18,11 @@ _: {
   */
   tailscale.enable = true; # Tailscale: secure network for remote access
 
+  /*
+  Calendar & Contacts
+  */
+  evolution.enable = true; # Evolution: calendar and contacts application
+
   /*
   Gaming
   */
diff --git a/hosts/default/system-modules.nix b/hosts/default/system-modules.nix
index 8b8ba20..69a0679 100644
--- a/hosts/default/system-modules.nix
+++ b/hosts/default/system-modules.nix
@@ -18,6 +18,11 @@ _: {
   */
   tailscale.enable = false; # Tailscale: secure network for remote access
 
+  /*
+  Calendar & Contacts
+  */
+  evolution.enable = true; # Evolution: calendar and contacts application
+
   /*
   Gaming
   */
diff --git a/modules/core/default.nix b/modules/core/default.nix
index 3a1ab56..46fd055 100644
--- a/modules/core/default.nix
+++ b/modules/core/default.nix
@@ -3,6 +3,7 @@
     ./packages
     ./boot.nix
     ./docker.nix
+    ./evolution.nix
     ./flatpak.nix
     ./fonts.nix
     ./garandos-tui.nix
diff --git a/modules/core/evolution.nix b/modules/core/evolution.nix
new file mode 100644
index 0000000..f42305f
--- /dev/null
+++ b/modules/core/evolution.nix
@@ -0,0 +1,12 @@
+{
+  lib,
+  config,
+  ...
+}: {
+  options.evolution.enable = lib.mkEnableOption "Enable Evolution";
+
+  config = {
+    programs.evolution.enable = lib.mkIf config.evolution.enable true;
+    services.gnome.evolution-data-server.enable = lib.mkIf config.evolution.enable true;
+  };
+}
diff --git a/modules/core/packages/programs.nix b/modules/core/packages/programs.nix
index 3b7058d..18af63f 100644
--- a/modules/core/packages/programs.nix
+++ b/modules/core/packages/programs.nix
@@ -19,6 +19,5 @@ _: {
       #   biome
       # ];
     };
-    evolution.enable = true;
   };
 }
diff --git a/modules/core/services.nix b/modules/core/services.nix
index a269864..274d5fc 100644
--- a/modules/core/services.nix
+++ b/modules/core/services.nix
@@ -18,10 +18,7 @@
       ports = [22];
     };
     tumbler.enable = true; # Image/video preview
-    gnome = {
-      gnome-keyring.enable = true;
-      evolution-data-server.enable = true;
-    };
+    gnome.gnome-keyring.enable = true;
     smartd = {
       enable =
         if profile == "vm"
diff --git a/modules/home/hyprland/binds.nix b/modules/home/hyprland/binds.nix
index 16a346a..a9a2d1a 100644
--- a/modules/home/hyprland/binds.nix
+++ b/modules/home/hyprland/binds.nix
@@ -31,6 +31,7 @@
 
   shiftBinds = [
     "SUPER SHIFT, C, exec, dex ${desktopEntriesPath}/claude.desktop #\"Claude AI chat\""
+    "SUPER SHIFT, E, exec, evolution #\"Personal information management application\""
     "SUPER SHIFT, Escape, exec, noctalia-shell ipc call sessionMenu toggle #\"Open Session Menu\""
     "SUPER SHIFT, G, exec, dex ${desktopEntriesPath}/chatgpt.desktop #\"ChatGPT AI chat\""
     "SUPER SHIFT, K, exec, noctalia-shell ipc call plugin:keybind-cheatsheet toggle #\"Toggle keybind cheatsheet\""