diff --git a/modules/home/de/hyprland/default.nix b/modules/home/de/hyprland/default.nix index 2648d44..85dbb90 100644 --- a/modules/home/de/hyprland/default.nix +++ b/modules/home/de/hyprland/default.nix @@ -1,6 +1,5 @@ { config, - pkgs, lib, ... }: let @@ -13,16 +12,7 @@ in { options.myConfig.de.hyprland.enable = lib.mkEnableOption ""; - config = lib.mkIf cfg.hyprland.enable { - home.packages = [pkgs.hyprpaper]; - xdg.configFile."hypr/hyprpaper.conf".text = '' - preload=${cfg.wallpaper} - wallpaper=,${cfg.wallpaper} - splash=false - ''; - - services.dunst.enable = true; - + config = lib.mkIf config.myConfig.de.hyprland.enable { myConfig.de = { hypridlelock.enable = true; waybar.enable = true; diff --git a/modules/home/de/theme.nix b/modules/home/de/theme.nix index 5febcf6..4928210 100644 --- a/modules/home/de/theme.nix +++ b/modules/home/de/theme.nix @@ -6,14 +6,7 @@ }: let cfg = config.myConfig.de; in { - options.myConfig.de = { - theme = lib.mkOption { - type = lib.types.str; - }; - wallpaper = lib.mkOption { - type = lib.types.path; - }; - }; + options.myConfig.de.theme = lib.mkOption {type = lib.types.str;}; config = lib.mkMerge [ (lib.mkIf (cfg.theme == "dark") { diff --git a/users/seb/home.nix b/users/seb/home.nix index 1535914..1c35669 100644 --- a/users/seb/home.nix +++ b/users/seb/home.nix @@ -8,10 +8,7 @@ xdg.userDirs.extraConfig.XDG_SCREENSHOTS_DIR = "${config.xdg.userDirs.pictures}/Screenshots"; myConfig = { - de = { - hyprland.enable = osConfig.myConfig.de.hyprland.enable; - wallpaper = ./wallpaper; - }; + de.hyprland.enable = osConfig.myConfig.de.hyprland.enable; shell = { bash.enable = true; diff --git a/wrappers/hyprpaper.nix b/wrappers/hyprpaper.nix new file mode 100644 index 0000000..447a825 --- /dev/null +++ b/wrappers/hyprpaper.nix @@ -0,0 +1,19 @@ +{ + assembleWrapper, + pkgs, + ... +}: +assembleWrapper { + basePackage = pkgs.hyprpaper; + + flags = let + hyprpaper-config = pkgs.writeText "hyprpaper-config" '' + preload = ~/Pictures/.wallpaper + wallpaper = , ~/Pictures/.wallpaper + splash = false + ''; + in [ + "--config" + hyprpaper-config + ]; +}