CosmicWM additiona and testing Akonadi

2 files changed, 34 insertions, 20 deletions

diff --git a/home-modules/apps/desktop/default.nix b/home-modules/apps/desktop/default.nix
index 9a6f0e4..a732ded 100644
--- a/home-modules/apps/desktop/default.nix
+++ b/home-modules/apps/desktop/default.nix
@@ -67,7 +67,14 @@ in
         ];
       })
       (lib.mkIf cfg.note-taking.enable {
-        home.packages = with pkgs; [ obsidian ];
+        home.packages = with pkgs; [ 
+          obsidian 
+          kdePackages.kdepim-runtime
+          ] ++ (with pkgs.kdePackages; [ 
+          zanshin 
+          kdepim-runtime 
+          akonadi-calendar
+        ]);
         # Todo force synthing to be on here
       })
       (lib.mkIf cfg.art.enable {
diff --git a/home-modules/desktop/hyprland.nix b/home-modules/desktop/hyprland.nix
index caca14f..80773d4 100644
--- a/home-modules/desktop/hyprland.nix
+++ b/home-modules/desktop/hyprland.nix
@@ -38,7 +38,7 @@ with lib;
 
     # Hyprland
     wayland.windowManager.hyprland = {
-      systemd.enable = false;
+      systemd.enable = true;
       enable = true;
       xwayland.enable = true;
       settings = {
@@ -252,6 +252,9 @@ with lib;
       };
     };
 
+    systemd.user.services.hyprpaper = {
+      Install.WantedBy = [ "hyprland-session.target"];
+    };
     services.hyprpaper = {
       enable = true;
       settings = {
@@ -301,6 +304,7 @@ with lib;
     };
     services.hyprsunset = {
       enable = true;
+      systemdTarget = "hyprland-session.target"; 
       settings = {
         max-gamma = 140;
         profile = [
@@ -324,25 +328,28 @@ with lib;
       };
     };
 
-    services.hypridle.enable = true;
-    services.hypridle.settings = {
-      general = {
-        lock_cmd = "pidof hyprlock || hyprlock";
-        before_sleep_cmd = "loginctl lock-session";
-        ignore_dbus_inhibit = false;
-        after_sleep_cmd = "hyprctl_dispatch dpms on";
+    services.hypridle = { 
+      enable = true;
+      systemdTarget = "hyprland-session.target"; 
+      settings = {
+        general = {
+          lock_cmd = "pidof hyprlock || hyprlock";
+          before_sleep_cmd = "loginctl lock-session";
+          ignore_dbus_inhibit = false;
+          after_sleep_cmd = "hyprctl_dispatch dpms on";
+        };
+        listener = [
+          {
+            timeout = 120;
+            on-timeout = "hyprlock";
+          }
+          {
+            timeout = 300;
+            on-timeout = "hyprctl dispatch dpms off";
+            on-resume = "hyprctl dispatch dpms on";
+          }
+        ];
       };
-      listener = [
-        {
-          timeout = 120;
-          on-timeout = "hyprlock";
-        }
-        {
-          timeout = 300;
-          on-timeout = "hyprctl dispatch dpms off";
-          on-resume = "hyprctl dispatch dpms on";
-        }
-      ];
     };
   };
 }