Refactor Hyprland config structure

- grouped services and programs

flake.nix

@@ -32,13 +32,17 @@
 
     ## Hyprland ##
 
+    watershot = {
+      url = "github:Liassica/watershot/165dd431c95054ac1bfea2f9a85e1be924af21c9";
+      inputs.nixpkgs.follows = "nixpkgs-stable";
+    };
     better-control.url = "github:rishabh5321/better-control-flake";
 
     rose-pine-hyprcursor = {
       url = "github:ndom91/rose-pine-hyprcursor";
     };
 
-    # stylix.url = "github:danth/stylix/release-24.11";
+    stylix.url = "github:danth/stylix";
 
     ## Misc Packages ##
 

home/toph/common/optional/hyprland/gtk.nix

@@ -1,33 +0,0 @@
-{
-  pkgs,
-  ...
-}:
-
-{
-  home.pointerCursor = {
-    gtk.enable = true;
-    # x11.enable = true;
-    package = pkgs.bibata-cursors;
-    name = "Bibata-Modern-Classic";
-    size = 16;
-  };
-
-  gtk = {
-    enable = true;
-
-    theme = {
-      package = pkgs.flat-remix-gtk;
-      name = "Flat-Remix-GTK-Grey-Darkest";
-    };
-
-    iconTheme = {
-      package = pkgs.adwaita-icon-theme;
-      name = "Adwaita";
-    };
-
-    font = {
-      name = "Sans";
-      size = 12;
-    };
-  };
-}

home/toph/common/optional/hyprland/hyprpaper/default.nix

@@ -1,39 +0,0 @@
-# Hyprpaper is used to set the wallpaper on the system
-{
-  pkgs,
-  config,
-  ...
-}:
-let
-  # wallpaper = "/home/${config.hostSpec.username}/Pictures/Wallpapers/wallpaper.jpg";
-  # wallpaper = "/home/${config.hostSpec.username}/Pictures/Wallpapers/wallpaper.png";
-  wallpaper = "/home/${config.hostSpec.username}/Pictures/Wallpapers/invincible.jpg";
-in
-{
-  # The wallpaper is set by stylix
-  services.hyprpaper = {
-    enable = true;
-    settings = {
-      ipc = "on";
-      splash = false;
-      splash_offset = 2.0;
-      preload = [
-        wallpaper
-      ];
-      wallpaper = [
-        ", ${wallpaper}"
-      ];
-    };
-  };
-
-  home.file."Pictures/Wallpapers" = {
-    source = ./wallpapers;
-    recursive = true;
-  };
-
-  wayland.windowManager.hyprland.settings = {
-    exec-once = [
-      "${pkgs.hyprpaper}/bin/hyprpaper"
-    ];
-  };
-}

home/toph/common/optional/hyprland/programs/default.nix

@@ -0,0 +1,4 @@
+{ lib, ... }:
+{
+  imports = lib.custom.scanPaths ./.;
+}

home/toph/common/optional/hyprland/services/default.nix

@@ -0,0 +1,4 @@
+{ lib, ... }:
+{
+  imports = lib.custom.scanPaths ./.;
+}

home/toph/common/optional/hyprland/services/hyprpaper.nix

@@ -0,0 +1,23 @@
+# Hyprpaper is used to set the wallpaper on the system
+{
+  pkgs,
+  config,
+  ...
+}:
+{
+  # The wallpaper is set by stylix
+  services.hyprpaper = {
+    enable = true;
+    settings = {
+      ipc = "on";
+      splash = false;
+      splash_offset = 2.0;
+    };
+  };
+
+  wayland.windowManager.hyprland.settings = {
+    exec-once = [
+      "${pkgs.hyprpaper}/bin/hyprpaper"
+    ];
+  };
+}

home/toph/common/optional/hyprland/services/playerctl.nix

@@ -1,6 +1,5 @@
 { pkgs, ... }:
 {
-  home.packages = [ pkgs.playerctl ];
   services.playerctld = {
     enable = true;
   };