From c41e664a6b5bb0c935151cab97f859a44acf0ce7 Mon Sep 17 00:00:00 2001 From: GarandPLG Date: Wed, 11 Feb 2026 23:39:20 +0100 Subject: [PATCH] Switch from Evolution to GNOME Calendar module MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Enable `calendar.enable` instead of `evolution.enable` in all host system‑modules files. - Add `modules/core/calendar.nix` defining the calendar option and installing GNOME Calendar and Contacts. - Remove the deprecated `modules/core/evolution.nix` and update `core/default.nix` imports accordingly. - Include the GNOME package set via `./gnome.nix` in `modules/core/packages/default.nix`. --- hosts/Garand-Desktop/system-modules.nix | 4 ++-- hosts/Garand-Laptop/system-modules.nix | 4 ++-- hosts/default/system-modules.nix | 4 ++-- modules/core/calendar.nix | 16 ++++++++++++++++ modules/core/default.nix | 2 +- modules/core/evolution.nix | 12 ------------ modules/core/packages/packages.nix | 2 +- modules/home/hyprland/binds.nix | 2 +- modules/home/hyprland/windowrules.nix | 4 ++++ 9 files changed, 29 insertions(+), 21 deletions(-) create mode 100644 modules/core/calendar.nix delete mode 100644 modules/core/evolution.nix diff --git a/hosts/Garand-Desktop/system-modules.nix b/hosts/Garand-Desktop/system-modules.nix index 5ac47b1..2c1cc2f 100644 --- a/hosts/Garand-Desktop/system-modules.nix +++ b/hosts/Garand-Desktop/system-modules.nix @@ -21,7 +21,7 @@ _: { /* Calendar & Contacts */ - evolution.enable = true; # Evolution: calendar and contacts application + calendar.enable = true; # GNOME Calendar: calendar and contacts application /* Gaming @@ -87,7 +87,7 @@ _: { Utilities / Misc */ eddieAirVPN.enable = true; # Eddie AirVPN: VPN client - galculator.enable = false; # Galculator: simple calculator + gnomeCalculator.enable = true; # gnomeCalculator: simple calculator gedit.enable = true; # Gedit: GNOME text editor winboat.enable = true; # Winboat: Windows remote desktop via RDP adb.enable = false; # ADB: Android SDK platform tools diff --git a/hosts/Garand-Laptop/system-modules.nix b/hosts/Garand-Laptop/system-modules.nix index cef8b00..98579d3 100644 --- a/hosts/Garand-Laptop/system-modules.nix +++ b/hosts/Garand-Laptop/system-modules.nix @@ -21,7 +21,7 @@ _: { /* Calendar & Contacts */ - evolution.enable = true; # Evolution: calendar and contacts application + calendar.enable = true; # GNOME Calendar: calendar and contacts application /* Gaming @@ -87,7 +87,7 @@ _: { Utilities / Misc */ eddieAirVPN.enable = true; # Eddie AirVPN: VPN client - galculator.enable = false; # Galculator: simple calculator + gnomeCalculator.enable = true; # gnomeCalculator: simple calculator gedit.enable = false; # Gedit: GNOME text editor winboat.enable = false; # Winboat: Windows remote desktop via RDP adb.enable = false; # ADB: Android SDK platform tools diff --git a/hosts/default/system-modules.nix b/hosts/default/system-modules.nix index 69a0679..ce21737 100644 --- a/hosts/default/system-modules.nix +++ b/hosts/default/system-modules.nix @@ -21,7 +21,7 @@ _: { /* Calendar & Contacts */ - evolution.enable = true; # Evolution: calendar and contacts application + calendar.enable = true; # GNOME Calendar: calendar and contacts application /* Gaming @@ -87,7 +87,7 @@ _: { Utilities / Misc */ eddieAirVPN.enable = true; # Eddie AirVPN: VPN client - galculator.enable = false; # Galculator: simple calculator + gnomeCalculator.enable = true; # gnomeCalculator: simple calculator gedit.enable = false; # Gedit: GNOME text editor winboat.enable = false; # Winboat: Windows remote desktop via RDP adb.enable = false; # ADB: Android SDK platform tools diff --git a/modules/core/calendar.nix b/modules/core/calendar.nix new file mode 100644 index 0000000..0cce520 --- /dev/null +++ b/modules/core/calendar.nix @@ -0,0 +1,16 @@ +{ + pkgs, + lib, + config, + ... +}: { + options.calendar.enable = lib.mkEnableOption "Enable GNOME Calendar"; + + config = { + services.gnome.evolution-data-server.enable = lib.mkIf config.calendar.enable true; + environment.systemPackages = lib.mkIf config.calendar.enable (with pkgs; [ + gnome-calendar + gnome-contacts + ]); + }; +} diff --git a/modules/core/default.nix b/modules/core/default.nix index 46fd055..573e210 100644 --- a/modules/core/default.nix +++ b/modules/core/default.nix @@ -2,8 +2,8 @@ imports = [ ./packages ./boot.nix + ./calendar.nix ./docker.nix - ./evolution.nix ./flatpak.nix ./fonts.nix ./garandos-tui.nix diff --git a/modules/core/evolution.nix b/modules/core/evolution.nix deleted file mode 100644 index f42305f..0000000 --- a/modules/core/evolution.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ - 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/packages.nix b/modules/core/packages/packages.nix index b70c241..d0548f2 100644 --- a/modules/core/packages/packages.nix +++ b/modules/core/packages/packages.nix @@ -16,7 +16,7 @@ packages = with pkgs; { bitwarden = bitwarden-desktop; eddieAirVPN = eddie; - galculator = galculator; + gnomeCalculator = gnome-calculator; gedit = gedit; iotas = iotas; logseq = logseq; diff --git a/modules/home/hyprland/binds.nix b/modules/home/hyprland/binds.nix index a9a2d1a..36a1eb6 100644 --- a/modules/home/hyprland/binds.nix +++ b/modules/home/hyprland/binds.nix @@ -15,7 +15,7 @@ "SUPER, G, exec, affinity-v3 #\"Graphics editor\"" "SUPER, I, exec, iotas #\"Note-taking app\"" "SUPER, J, exec, Jan #\"Local AI chat interface\"" - "SUPER, K, exec, galculator #\"Scientific calculator\"" + "SUPER, K, exec, gnome-calculator #\"Scientific calculator\"" "SUPER, L, exec, logseq #\"Knowledge management tool\"" "SUPER, M, exec, plexamp #\"Music player for Plex\"" "SUPER, N, exec, dex ${desktopEntriesPath}/garandcloud.desktop #\"GarandCloud client\"" diff --git a/modules/home/hyprland/windowrules.nix b/modules/home/hyprland/windowrules.nix index f46ec6d..c1ec432 100644 --- a/modules/home/hyprland/windowrules.nix +++ b/modules/home/hyprland/windowrules.nix @@ -41,6 +41,7 @@ _: { "center on, match:class pavucontrol|org\.pulseaudio\.pavucontrol|com\.saivert\.pwvucontrol" "center on, match:class [Tt]hunar, match:title negative:.*[Tt]hunar.*" "center on, match:title Authentication Required" + "center on, match:class org\.gnome\.Calculator" # Idle inhibit rules "idle_inhibit fullscreen, match:class .*" @@ -61,11 +62,13 @@ _: { "float on, match:initial_title Add Folder to Workspace" "float on, match:initial_title Open Files" "float on, match:initial_title wants to save" + "float on, match:class org\.gnome\.Calculator" # Size rules "size 70% 60%, match:initial_title Open Files" "size 70% 60%, match:initial_title Add Folder to Workspace" "size 70% 70%, match:tag settings*" + "size 360 616, match:class org\.gnome\.Calculator" # Tile rules "tile on, match:class affinity\.exe" @@ -84,6 +87,7 @@ _: { "opacity 0.8 0.7, match:class gedit|org\.gnome\.TextEditor|mousepad" "opacity 0.9 0.8, match:class seahorse # gnome-keyring gui" "opacity 0.95 0.75, match:title Picture-in-Picture" + "opacity 0.9 0.8, match:class org\.gnome\.Calculator" # Picture-in-Picture specific rules "pin on, match:title Picture-in-Picture"