diff --git a/Droidnix/README.org b/Droidnix/README.org index e5fdca44a..fca2f5758 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -728,8 +728,8 @@ let username = config.defaultUser or "henrov"; homeDir = "/home/${username}"; - wallpaperSrc = "${flakeRoot}/assets/traveldroid/copy_2_home/wallpaperstuff"; - wallpaperDst = "${homeDir}/wallpaperstuff"; + wallpaperSrc = "${flakeRoot}/assets/traveldroid/Wallpapers"; + wallpaperDst = "${homeDir}/Wallpapers"; in { ################################# diff --git a/Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/pictures/05.jpg b/Droidnix/assets/traveldroid/Wallpapers/pictures/05.jpg similarity index 100% rename from Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/pictures/05.jpg rename to Droidnix/assets/traveldroid/Wallpapers/pictures/05.jpg diff --git a/Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/pictures/06.jpg b/Droidnix/assets/traveldroid/Wallpapers/pictures/06.jpg similarity index 100% rename from Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/pictures/06.jpg rename to Droidnix/assets/traveldroid/Wallpapers/pictures/06.jpg diff --git a/Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/pictures/1.jpg b/Droidnix/assets/traveldroid/Wallpapers/pictures/1.jpg similarity index 100% rename from Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/pictures/1.jpg rename to Droidnix/assets/traveldroid/Wallpapers/pictures/1.jpg diff --git a/Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/pictures/10.jpg b/Droidnix/assets/traveldroid/Wallpapers/pictures/10.jpg similarity index 100% rename from Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/pictures/10.jpg rename to Droidnix/assets/traveldroid/Wallpapers/pictures/10.jpg diff --git a/Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/pictures/11.jpg b/Droidnix/assets/traveldroid/Wallpapers/pictures/11.jpg similarity index 100% rename from Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/pictures/11.jpg rename to Droidnix/assets/traveldroid/Wallpapers/pictures/11.jpg diff --git a/Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/pictures/12.jpg b/Droidnix/assets/traveldroid/Wallpapers/pictures/12.jpg similarity index 100% rename from Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/pictures/12.jpg rename to Droidnix/assets/traveldroid/Wallpapers/pictures/12.jpg diff --git a/Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/pictures/13.jpg b/Droidnix/assets/traveldroid/Wallpapers/pictures/13.jpg similarity index 100% rename from Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/pictures/13.jpg rename to Droidnix/assets/traveldroid/Wallpapers/pictures/13.jpg diff --git a/Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/pictures/14.jpg b/Droidnix/assets/traveldroid/Wallpapers/pictures/14.jpg similarity index 100% rename from Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/pictures/14.jpg rename to Droidnix/assets/traveldroid/Wallpapers/pictures/14.jpg diff --git a/Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/pictures/15.jpg b/Droidnix/assets/traveldroid/Wallpapers/pictures/15.jpg similarity index 100% rename from Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/pictures/15.jpg rename to Droidnix/assets/traveldroid/Wallpapers/pictures/15.jpg diff --git a/Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/pictures/16.jpg b/Droidnix/assets/traveldroid/Wallpapers/pictures/16.jpg similarity index 100% rename from Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/pictures/16.jpg rename to Droidnix/assets/traveldroid/Wallpapers/pictures/16.jpg diff --git a/Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/pictures/17.jpg b/Droidnix/assets/traveldroid/Wallpapers/pictures/17.jpg similarity index 100% rename from Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/pictures/17.jpg rename to Droidnix/assets/traveldroid/Wallpapers/pictures/17.jpg diff --git a/Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/pictures/18.jpg b/Droidnix/assets/traveldroid/Wallpapers/pictures/18.jpg similarity index 100% rename from Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/pictures/18.jpg rename to Droidnix/assets/traveldroid/Wallpapers/pictures/18.jpg diff --git a/Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/pictures/2.jpg b/Droidnix/assets/traveldroid/Wallpapers/pictures/2.jpg similarity index 100% rename from Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/pictures/2.jpg rename to Droidnix/assets/traveldroid/Wallpapers/pictures/2.jpg diff --git a/Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/pictures/3.jpg b/Droidnix/assets/traveldroid/Wallpapers/pictures/3.jpg similarity index 100% rename from Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/pictures/3.jpg rename to Droidnix/assets/traveldroid/Wallpapers/pictures/3.jpg diff --git a/Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/pictures/4.jpg b/Droidnix/assets/traveldroid/Wallpapers/pictures/4.jpg similarity index 100% rename from Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/pictures/4.jpg rename to Droidnix/assets/traveldroid/Wallpapers/pictures/4.jpg diff --git a/Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/pictures/5.jpg b/Droidnix/assets/traveldroid/Wallpapers/pictures/5.jpg similarity index 100% rename from Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/pictures/5.jpg rename to Droidnix/assets/traveldroid/Wallpapers/pictures/5.jpg diff --git a/Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/pictures/6.jpg b/Droidnix/assets/traveldroid/Wallpapers/pictures/6.jpg similarity index 100% rename from Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/pictures/6.jpg rename to Droidnix/assets/traveldroid/Wallpapers/pictures/6.jpg diff --git a/Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/pictures/7.jpg b/Droidnix/assets/traveldroid/Wallpapers/pictures/7.jpg similarity index 100% rename from Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/pictures/7.jpg rename to Droidnix/assets/traveldroid/Wallpapers/pictures/7.jpg diff --git a/Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/pictures/8.jpg b/Droidnix/assets/traveldroid/Wallpapers/pictures/8.jpg similarity index 100% rename from Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/pictures/8.jpg rename to Droidnix/assets/traveldroid/Wallpapers/pictures/8.jpg diff --git a/Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/pictures/9.jpg b/Droidnix/assets/traveldroid/Wallpapers/pictures/9.jpg similarity index 100% rename from Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/pictures/9.jpg rename to Droidnix/assets/traveldroid/Wallpapers/pictures/9.jpg diff --git a/Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/videos/dark_water_large.mp4 b/Droidnix/assets/traveldroid/Wallpapers/videos/dark_water_large.mp4 similarity index 100% rename from Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/videos/dark_water_large.mp4 rename to Droidnix/assets/traveldroid/Wallpapers/videos/dark_water_large.mp4 diff --git a/Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/videos/myWallpaper.mp4 b/Droidnix/assets/traveldroid/Wallpapers/videos/myWallpaper.mp4 similarity index 100% rename from Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/videos/myWallpaper.mp4 rename to Droidnix/assets/traveldroid/Wallpapers/videos/myWallpaper.mp4 diff --git a/Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/videos/white_blobs_small.mp4 b/Droidnix/assets/traveldroid/Wallpapers/videos/white_blobs_small.mp4 similarity index 100% rename from Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/videos/white_blobs_small.mp4 rename to Droidnix/assets/traveldroid/Wallpapers/videos/white_blobs_small.mp4 diff --git a/Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/wallpaper.conf b/Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/wallpaper.conf deleted file mode 100644 index ed9b034ba..000000000 --- a/Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/wallpaper.conf +++ /dev/null @@ -1,41 +0,0 @@ -############################################## -# Wallpaper config (wpaperd, TOML) -# -# Source-of-truth in repo: -# ~/henrovnix/assets/conf/desktop/wallpaper/wallpaper.conf -# -# Runtime override (user edits this): -# ~/conf/desktop/wallpaper/wallpaper.conf -# -# Wallpapers are copied from repo to: -# ~/wallpapers/ -# and by default loaded from: -# ~/wallpapers/pictures -############################################## - -[default] -# Directory to pick wallpapers from -path = "~/nixos_conf/wallpaperstuff/pictures" - -# Switch every X minutes -duration = "5m" - -# Random order (ascending/descending/random) -sorting = "random" - -# Include subfolders -recursive = true - -# How to fit wallpaper on screen -mode = "stretch" - -# Transition time in milliseconds -transition-time = 5000 - -# Apply a "fade-like" transition (uses gl-transitions) -[default.transition.dissolve] -# (leave empty to use the transition defaults) - -# Apply these defaults to any monitor not explicitly listed -[any] -# (inherits [default]; keep empty unless you want overrides) diff --git a/Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/wpaperd-runtime.toml b/Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/wpaperd-runtime.toml deleted file mode 100644 index 010995267..000000000 --- a/Droidnix/assets/traveldroid/copy_2_home/wallpaperstuff/wpaperd-runtime.toml +++ /dev/null @@ -1,6 +0,0 @@ -[default] -mode = "stretch" - -# Fallback for outputs not explicitly listed: -[any] -path = "/home/henrov/nixos_conf/wallpaperstuff/pictures" diff --git a/Droidnix/generated/modules/traveldroid/desktop/rotating_wallpaper.nix b/Droidnix/generated/modules/traveldroid/desktop/rotating_wallpaper.nix index c7e1bc1a7..9d1176b23 100644 --- a/Droidnix/generated/modules/traveldroid/desktop/rotating_wallpaper.nix +++ b/Droidnix/generated/modules/traveldroid/desktop/rotating_wallpaper.nix @@ -4,8 +4,8 @@ let username = config.defaultUser or "henrov"; homeDir = "/home/${username}"; - wallpaperSrc = "${flakeRoot}/assets/traveldroid/copy_2_home/wallpaperstuff"; - wallpaperDst = "${homeDir}/wallpaperstuff"; + wallpaperSrc = "${flakeRoot}/assets/traveldroid/Wallpapers"; + wallpaperDst = "${homeDir}/Wallpapers"; in { #################################