diff --git a/Droidnix/README.org b/Droidnix/README.org index 53fa6ac75..bb25e7bd3 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -719,9 +719,9 @@ in } #+END_SRC -** =generated/modules/traveldroid/desktop/rotating_wallpaper.nix= +** =generated/modules/traveldroid/desktop/wallpaper.nix= Setting up wallpaper engine + wall[pa[per gui -#+BEGIN_SRC nix :tangle generated/modules/traveldroid/desktop/rotating_wallpaper.nix :noweb tangle :mkdirp yes :eval never-html +#+BEGIN_SRC nix :tangle generated/modules/traveldroid/desktop/wallpaper.nix :noweb tangle :mkdirp yes :eval never-html { lib, config, pkgs, flakeRoot, ... }: let username = config.defaultUser or "henrov"; @@ -747,32 +747,23 @@ in systemd.services.copyWallpaperStuff = { description = "Copy wallpaper assets to user home"; - wantedBy = [ "multi-user.target" ]; - - # 🔑 CRITICAL FIX after = [ "systemd-user-sessions.service" ]; wants = [ "systemd-user-sessions.service" ]; - serviceConfig = { Type = "oneshot"; }; - script = '' # Wait until user exists (robust) for i in $(seq 1 10); do id ${username} && break sleep 1 done - mkdir -p "${wallpaperDst}" - # Copy only if empty (prevents overwrite) if [ -z "$(ls -A ${wallpaperDst})" ]; then cp -r ${wallpaperSrc}/* "${wallpaperDst}/" fi - - # 🔑 FIX: use user only, not group chown -R ${username} "${wallpaperDst}" chmod -R u+rwx "${wallpaperDst}" ''; @@ -781,7 +772,6 @@ in ################################# # Home Manager integration ################################# - _module.args.hmUsers = { ${username} = { @@ -793,7 +783,6 @@ in ################################# # swww daemon ################################# - systemd.user.services.swww-daemon = { Unit = { Description = "swww wallpaper daemon"; @@ -823,7 +812,7 @@ in Service = { Type = "oneshot"; ExecStart = '' - ${pkgs.swww}/bin/swww img ${wallpaperDst}/* --transition-type any + ${pkgs.swww}/bin/swww img ${wallpaperDst} --transition-type fade slide blend zoom wipe cube fade-zoom slide-zoom ''; }; diff --git a/Droidnix/assets/traveldroid/Wallpapers/pictures/05.jpg b/Droidnix/assets/traveldroid/Wallpapers/pictures/05.jpg deleted file mode 100644 index ecf0dce30..000000000 Binary files a/Droidnix/assets/traveldroid/Wallpapers/pictures/05.jpg and /dev/null differ diff --git a/Droidnix/assets/traveldroid/Wallpapers/pictures/06.jpg b/Droidnix/assets/traveldroid/Wallpapers/pictures/06.jpg deleted file mode 100644 index c304de4b8..000000000 Binary files a/Droidnix/assets/traveldroid/Wallpapers/pictures/06.jpg and /dev/null differ diff --git a/Droidnix/assets/traveldroid/Wallpapers/pictures/5.jpg b/Droidnix/assets/traveldroid/Wallpapers/pictures/5.jpg deleted file mode 100644 index 38d91de61..000000000 Binary files a/Droidnix/assets/traveldroid/Wallpapers/pictures/5.jpg and /dev/null differ diff --git a/Droidnix/assets/traveldroid/Wallpapers/pictures/6.jpg b/Droidnix/assets/traveldroid/Wallpapers/pictures/6.jpg deleted file mode 100644 index 614b97e9b..000000000 Binary files a/Droidnix/assets/traveldroid/Wallpapers/pictures/6.jpg and /dev/null differ diff --git a/Droidnix/generated/modules/traveldroid/desktop/rotating_wallpaper.nix b/Droidnix/generated/modules/traveldroid/desktop/wallpaper.nix similarity index 94% rename from Droidnix/generated/modules/traveldroid/desktop/rotating_wallpaper.nix rename to Droidnix/generated/modules/traveldroid/desktop/wallpaper.nix index 66b39836b..1be22fd6c 100644 --- a/Droidnix/generated/modules/traveldroid/desktop/rotating_wallpaper.nix +++ b/Droidnix/generated/modules/traveldroid/desktop/wallpaper.nix @@ -23,32 +23,23 @@ in systemd.services.copyWallpaperStuff = { description = "Copy wallpaper assets to user home"; - wantedBy = [ "multi-user.target" ]; - - # 🔑 CRITICAL FIX after = [ "systemd-user-sessions.service" ]; wants = [ "systemd-user-sessions.service" ]; - serviceConfig = { Type = "oneshot"; }; - script = '' # Wait until user exists (robust) for i in $(seq 1 10); do id ${username} && break sleep 1 done - mkdir -p "${wallpaperDst}" - # Copy only if empty (prevents overwrite) if [ -z "$(ls -A ${wallpaperDst})" ]; then cp -r ${wallpaperSrc}/* "${wallpaperDst}/" fi - - # 🔑 FIX: use user only, not group chown -R ${username} "${wallpaperDst}" chmod -R u+rwx "${wallpaperDst}" ''; @@ -57,7 +48,6 @@ in ################################# # Home Manager integration ################################# - _module.args.hmUsers = { ${username} = { @@ -69,7 +59,6 @@ in ################################# # swww daemon ################################# - systemd.user.services.swww-daemon = { Unit = { Description = "swww wallpaper daemon"; @@ -99,7 +88,7 @@ in Service = { Type = "oneshot"; ExecStart = '' - ${pkgs.swww}/bin/swww img ${wallpaperDst}/* --transition-type any + ${pkgs.swww}/bin/swww img ${wallpaperDst} --transition-type fade slide blend zoom wipe cube fade-zoom slide-zoom ''; };