From 7eead37864bd96d9d487ef88e4b26d1dfd6300d4 Mon Sep 17 00:00:00 2001
From: uttarayan21 <email@uttarayan.me>
Date: Sat, 18 Oct 2025 12:51:53 +0530
Subject: [PATCH] refactor(aichat): disable mayichat and rename config to
 aichat

refactor(hyprland): separate hyprpaper config into its own module

feat(services): add hyprpaper service with updated wallpaper settings
---
 home/programs/aichat.nix    |  4 +++-
 home/services/default.nix   |  5 +++--
 home/services/hyprland.nix  | 19 -------------------
 home/services/hyprpaper.nix | 30 ++++++++++++++++++++++++++++++
 modules/aichat.nix          |  4 ++--
 utils/wallhaven.nix         |  3 +--
 6 files changed, 39 insertions(+), 26 deletions(-)
 create mode 100644 home/services/hyprpaper.nix

diff --git a/home/programs/aichat.nix b/home/programs/aichat.nix
index 5c0bcc57..d541c82a 100644
--- a/home/programs/aichat.nix
+++ b/home/programs/aichat.nix
@@ -8,7 +8,9 @@
   imports = [
     ../../modules/aichat.nix
   ];
-  programs.mayichat = {
+
+  disabledModules = ["programs/aichat.nix"];
+  programs.aichat = {
     enable = true;
     enableFishIntegration = true;
     enableNushellIntegration = false;
diff --git a/home/services/default.nix b/home/services/default.nix
index 0f2ed02a..2ae650c8 100644
--- a/home/services/default.nix
+++ b/home/services/default.nix
@@ -3,13 +3,14 @@
     ./swaync.nix
     ./swayosd.nix
     ./kdeconnect.nix
-    ./hyprland.nix
     ./gtk.nix
     ./anyrun.nix
     ./ironbar
     ./gui.nix
     ./eww.nix
-    ./hyprmon.nix
     ./xdg.nix
+    ./hyprmon.nix
+    ./hyprland.nix
+    ./hyprpaper.nix
   ];
 }
diff --git a/home/services/hyprland.nix b/home/services/hyprland.nix
index bcd52105..ee93a4fb 100644
--- a/home/services/hyprland.nix
+++ b/home/services/hyprland.nix
@@ -1,15 +1,10 @@
 {
   pkgs,
   device,
-  lib,
   ...
 }:
 # lib.optionalAttrs device.isNix
 {
-  imports = [
-    ../../modules/hyprpaper.nix
-  ];
-
   # services.hyprpolkitagent.enable = true;
   services.hypridle = {
     enable = device.is "ryu";
@@ -29,20 +24,6 @@
   services.hyprsunset = {
     enable = device.is "ryu";
   };
-  programs.hyprpaper = let
-    wallpapers = import ../../utils/wallhaven.nix {inherit pkgs;};
-  in {
-    enable = device.is "ryu";
-    # enable = true;
-    systemd.enable = true;
-    systemd.target = "hyprland-session.target";
-    settings.preload = wallpapers.all;
-    settings.wallpapers = {
-      "${device.monitors.primary}" = wallpapers.hornet;
-      "${device.monitors.secondary}" = wallpapers.frieren_3;
-      "${device.monitors.tertiary}" = wallpapers.shapes;
-    };
-  };
   programs.hyprlock = {
     enable = device.is "ryu";
   };
diff --git a/home/services/hyprpaper.nix b/home/services/hyprpaper.nix
new file mode 100644
index 00000000..e9ae50e2
--- /dev/null
+++ b/home/services/hyprpaper.nix
@@ -0,0 +1,30 @@
+{
+  pkgs,
+  device,
+  config,
+  ...
+}: {
+  imports = [
+    ../../modules/hyprpaper.nix
+  ];
+  programs.hyprpaper = let
+    wallpapers = import ../../utils/wallhaven.nix {inherit pkgs;};
+    nextcloudWallpapers = name: config.home.homeDirectory + "/Nextcloud/Wallpapers/" + name;
+    silksongFleas = nextcloudWallpapers "silksong-fleas.jpg";
+  in {
+    enable = device.is "ryu";
+    # enable = true;
+    systemd.enable = true;
+    systemd.target = "hyprland-session.target";
+    settings.preload =
+      wallpapers.all
+      ++ [
+        silksongFleas
+      ];
+    settings.wallpapers = {
+      "${device.monitors.primary}" = silksongFleas;
+      "${device.monitors.secondary}" = wallpapers.frieren_3;
+      "${device.monitors.tertiary}" = wallpapers.hornet;
+    };
+  };
+}
diff --git a/modules/aichat.nix b/modules/aichat.nix
index c2e37baf..429eb698 100644
--- a/modules/aichat.nix
+++ b/modules/aichat.nix
@@ -5,7 +5,7 @@
   ...
 }:
 with lib; let
-  cfg = config.programs.mayichat;
+  cfg = config.programs.aichat;
   yamlFormat = pkgs.formats.yaml {};
   fishIntegration = ''
     function _aichat_fish
@@ -64,7 +64,7 @@ with lib; let
   '';
 in {
   options = {
-    programs.mayichat = {
+    programs.aichat = {
       enable = mkEnableOption "aichat";
       package = mkPackageOption pkgs "aichat" {};
 
diff --git a/utils/wallhaven.nix b/utils/wallhaven.nix
index f88c6e89..0ff7e6d3 100644
--- a/utils/wallhaven.nix
+++ b/utils/wallhaven.nix
@@ -40,6 +40,5 @@ in rec {
     sha256 = "11w5lfqg6ip6zhiwfw63gv08f55kqbfnhmv7iq07mfspny36w840";
   };
 
-  anime = [frieren_3];
-  all = [lights shapes cloud skull moon] ++ anime;
+  all = [lights shapes cloud skull moon hornet frieren_3];
 }