CosmicWM additiona and testing Akonadi

4 files changed, 28 insertions, 0 deletions

diff --git a/modules/desktop/akonadi.nix b/modules/desktop/akonadi.nix
new file mode 100644
index 0000000..93006b2
--- /dev/null
+++ b/modules/desktop/akonadi.nix
@@ -0,0 +1,8 @@
+{pkgs, config, ...}: {
+  programs.kde-pim = {
+    enable = true; 
+    kmail = false; 
+    merkuro = false; 
+    kontact = false; 
+  }; 
+}
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index 2cfe5bf..de32b42 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -22,6 +22,7 @@ in
     ./wayland.nix
     ./wms
     ./steam.nix
+    ./akonadi.nix
   ];
   options.addons.desktop = with types; {
     wmMeta = mkOption {
diff --git a/modules/desktop/wms/cosmic.nix b/modules/desktop/wms/cosmic.nix
new file mode 100644
index 0000000..6f7c29e
--- /dev/null
+++ b/modules/desktop/wms/cosmic.nix
@@ -0,0 +1,18 @@
+{pkgs, config, lib, ... }: let 
+  cfg = config.addons.desktop.cosmic; 
+in {
+  options.addons.desktop.cosmic = {
+    enable = lib.mkEnableOption "Enable Cosmic WM"; 
+    enableScheduler = lib.mkEnableOption "Enable the special scheduler from system76";
+  }; 
+
+  config = lib.mkIf cfg.enable (
+    lib.mkMerge [
+      (import ../../../utils/makeWm.nix "Cosmic WM" "wayland")
+      {
+        services.desktopManager.cosmic.enable = true; 
+        services.system76-scheduler.enable = cfg.enableScheduler; 
+      }
+    ]
+  ); 
+}
diff --git a/modules/desktop/wms/default.nix b/modules/desktop/wms/default.nix
index 9f7a18d..ea6b61e 100644
--- a/modules/desktop/wms/default.nix
+++ b/modules/desktop/wms/default.nix
@@ -3,5 +3,6 @@
   imports = [
     ./hyprland.nix
     ./xfce.nix
+    ./cosmic.nix
   ];
 }