Move wallpaper to theme.wallpaper
Change-Id: I64843a4ea123c8b3a5906824aa194f49f526d7db
Reviewed-on: https://git.clicks.codes/c/Chimera/NixFiles/+/392
Reviewed-by: Samuel Shuert <coded@clicks.codes>
Tested-by: Skyler Grey <minion@clicks.codes>
diff --git a/homes/x86_64-linux/minion@greylag/default.nix b/homes/x86_64-linux/minion@greylag/default.nix
index 1affb66..54168a7 100644
--- a/homes/x86_64-linux/minion@greylag/default.nix
+++ b/homes/x86_64-linux/minion@greylag/default.nix
@@ -26,8 +26,6 @@
home.packages = [ pkgs.stgit ];
chimera = {
- wallpaper = ./wallpaper.png;
-
hyprland.enable = true;
hyprland.hyprpaper.splash.enable = true;
@@ -39,6 +37,7 @@
"desc:AOC 2460G5 0x00023C3F,preferred,336x-1080,1"
];
+ theme.wallpaper = ./wallpaper.png;
theme.catppuccin = {
enable = true;
style = "Latte";
diff --git a/modules/home/hyprpaper/default.nix b/modules/home/hyprpaper/default.nix
index 27d149a..2777974 100644
--- a/modules/home/hyprpaper/default.nix
+++ b/modules/home/hyprpaper/default.nix
@@ -1,7 +1,7 @@
{ config, lib, ... }:
{
options.chimera = {
- wallpaper = lib.mkOption {
+ theme.wallpaper = lib.mkOption {
type = lib.types.path;
description = "Wallpaper of your choosing";
};
@@ -18,9 +18,9 @@
# TODO: wallpapers path[] -> gen wallpaper lines...
config.xdg.configFile."hypr/hyprpaper.conf".source = lib.mkIf config.chimera.hyprland.enable (
builtins.toFile "hyprpaper.conf" ''
- preload = ${config.chimera.wallpaper}
+ preload = ${config.chimera.theme.wallpaper}
- wallpaper=,${config.chimera.wallpaper}
+ wallpaper=,${config.chimera.theme.wallpaper}
splash = ${builtins.toString config.chimera.hyprland.hyprpaper.splash.enable}
splash_offset = ${builtins.toString config.chimera.hyprland.hyprpaper.splash.offset}