2 files changed, 40 insertions, 12 deletions

diff --git a/modules/desktop/hyprland/default.nix b/modules/desktop/hyprland/default.nix
index bd80157..9f52232 100644
--- a/modules/desktop/hyprland/default.nix
+++ b/modules/desktop/hyprland/default.nix
@@ -9,14 +9,11 @@ let
 in
 {
   imports = [
+    ./hyprpaper.nix
     ./keybindings.nix
   ];
 
-  options.desktop.hyprland = {
-    enable = lib.mkEnableOption "Hyprland Wayland compositor";
-  };
-
-  config = lib.mkIf config.desktop.hyprland.enable {
+  config = lib.mkIf config.desktop.enable {
     wayland.windowManager.hyprland = {
       enable = true;
       configType = "lua";
@@ -35,10 +32,10 @@ in
             border_size = 1;
             col = {
               active_border = {
-                colors = [ (toHyprColor base07) ];
+                colors = [ (toHyprColor base03) ];
                 angle = 45;
               };
-              inactive_border = toHyprColor base03;
+              inactive_border = toHyprColor base00;
             };
             layout = "dwindle";
           };
@@ -52,6 +49,10 @@ in
             kb_layout = "us";
           };
 
+          cursor = {
+            enable_hyprcursor = true;
+          };
+
           dwindle = {
             preserve_split = true;
           };
@@ -109,12 +110,14 @@ in
       };
     };
 
-    services.hyprpaper = lib.mkIf config.media.feh.enable {
+    home.pointerCursor = {
       enable = true;
-      settings = {
-        preload = [ "${../../../assets/sapling.png}" ];
-        wallpaper = [ ",${../../../assets/sapling.png}" ];
-      };
+      package = pkgs.rose-pine-hyprcursor;
+      name = "rose-pine-hyprcursor";
+      size = 24;
+      hyprcursor.enable = true;
+      gtk.enable = false;
+      x11.enable = false;
     };
 
     home.packages = with pkgs; [
diff --git a/modules/desktop/hyprland/hyprpaper.nix b/modules/desktop/hyprland/hyprpaper.nix
new file mode 100644
index 0000000..5b8eab3
--- /dev/null
+++ b/modules/desktop/hyprland/hyprpaper.nix
@@ -0,0 +1,25 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+{
+  config = lib.mkIf config.desktop.enable {
+    services.hyprpaper = {
+      enable = true;
+      package = pkgs.hyprpaper;
+      settings = {
+        ipc = "on";
+        splash = false;
+        preload = [ "${../../../assets/sapling.png}" ];
+        wallpaper = [
+          {
+            monitor = "";
+            path = "${../../../assets/sapling.png}";
+          }
+        ];
+      };
+    };
+  };
+}