diff --git a/Droidnix/README.org b/Droidnix/README.org index 9cb2bd41c..2eb436a4c 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -796,19 +796,6 @@ in # Install wpaperd system-wide environment.systemPackages = with pkgs; [ wpaperd ]; - # Activation script: copy wallpapers & config to ~/.config/wpaperd - system.activationScripts.copyWpaperdConfig = { - text = '' - echo "=== Copying wpaperd config to $HOME/.config/wpaperd ===" - mkdir -p "${wallpaperTarget}" - cp -rT "${wallpaperSource}" "${wallpaperTarget}" - rsync -av --no-group --no-owner "${wallpaperSource}/" "$HOME/Droidnix/" - echo "Config files copied from $SOURCE_DIR to $HOME/Droidnix/." - echo "Done." - ''; - deps = [ ]; - }; - # User systemd service (runs on login) systemd.user.services.wpaperd = { description = "wpaperd wallpaper daemon"; @@ -816,6 +803,12 @@ in serviceConfig = { Type = "simple"; + # Copy config first, then run wpaperd + ExecStartPre = '' + mkdir -p "${wallpaperTarget}" + cp -rT "${wallpaperSource}" "${wallpaperTarget}" + rsync -av --no-group --no-owner "${wallpaperSource}/" "$HOME/Droidnix/" + ''; ExecStart = "${pkgs.wpaperd}/bin/wpaperd --config ${wallpaperTarget}/wallpaper.toml"; Restart = "on-failure"; RestartSec = 1; diff --git a/Droidnix/generated/hyprland/decorations/rotating_wallpaper.nix b/Droidnix/generated/hyprland/decorations/rotating_wallpaper.nix index b7507165c..ddcdaf4c0 100644 --- a/Droidnix/generated/hyprland/decorations/rotating_wallpaper.nix +++ b/Droidnix/generated/hyprland/decorations/rotating_wallpaper.nix @@ -14,19 +14,6 @@ in # Install wpaperd system-wide environment.systemPackages = with pkgs; [ wpaperd ]; - # Activation script: copy wallpapers & config to ~/.config/wpaperd - system.activationScripts.copyWpaperdConfig = { - text = '' - echo "=== Copying wpaperd config to $HOME/.config/wpaperd ===" - mkdir -p "${wallpaperTarget}" - cp -rT "${wallpaperSource}" "${wallpaperTarget}" - rsync -av --no-group --no-owner "${wallpaperSource}/" "$HOME/Droidnix/" - echo "Config files copied from $SOURCE_DIR to $HOME/Droidnix/." - echo "Done." - ''; - deps = [ ]; - }; - # User systemd service (runs on login) systemd.user.services.wpaperd = { description = "wpaperd wallpaper daemon"; @@ -34,6 +21,12 @@ in serviceConfig = { Type = "simple"; + # Copy config first, then run wpaperd + ExecStartPre = '' + mkdir -p "${wallpaperTarget}" + cp -rT "${wallpaperSource}" "${wallpaperTarget}" + rsync -av --no-group --no-owner "${wallpaperSource}/" "$HOME/Droidnix/" + ''; ExecStart = "${pkgs.wpaperd}/bin/wpaperd --config ${wallpaperTarget}/wallpaper.toml"; Restart = "on-failure"; RestartSec = 1;