GarandPLG/garandos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch from Evolution to GNOME Calendar module

Browse Source 
- 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`.
This commit is contained in:
GarandPLG
2026-02-11 23:39:20 +01:00
parent c78292ac67
commit c41e664a6b
9 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hosts/Garand-Desktop/system-modules.nix
View File

@@ -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

4
hosts/Garand-Laptop/system-modules.nix
View File

@@ -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

4
hosts/default/system-modules.nix
View File

@@ -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

16
modules/core/calendar.nix Normal file
View File

@@ -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
]);
};
}

2
modules/core/default.nix
View File

@@ -2,8 +2,8 @@
imports = [
./packages
./boot.nix
./calendar.nix
./docker.nix
./evolution.nix
./flatpak.nix
./fonts.nix
./garandos-tui.nix

12
modules/core/evolution.nix
View File

@@ -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;
};
}

2
modules/core/packages/packages.nix
View File

@@ -16,7 +16,7 @@
packages = with pkgs; {
bitwarden = bitwarden-desktop;
eddieAirVPN = eddie;
galculator = galculator;
gnomeCalculator = gnome-calculator;
gedit = gedit;
iotas = iotas;
logseq = logseq;

2
modules/home/hyprland/binds.nix
View File

@@ -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\""

4
modules/home/hyprland/windowrules.nix
View File

@@ -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"