diff --git a/Droidnix/README.org b/Droidnix/README.org index 08de3d045..95aad19bf 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -777,20 +777,14 @@ This is top file of this level which contains just an import statement for all r ** =generated/hyprland/decorations/rotating_wallpaper.nix= rotating_wallpaper.nix installs wpaperd and deploys your wallpaper files from the repo (./assets/copy_2_root/wallpaperstuff/) into ~/wallpaperstuff/. -You can edit assets/copy_2_root/wallpaperstuff/wallpaper.conf to change settings +You can edit assets/hyprland/wallpaperstuff/wallpaper.toml to change settings Finally, it creates a systemd user service (wpaperd.service) that automatically starts wpaperd at login and keeps it running, using your override config so wallpapers rotate according to your settings. #+BEGIN_SRC nix :tangle generated/hyprland/decorations/rotating_wallpaper.nix :noweb tangle :mkdirp yes :eval never-html -{ - config, - pkgs, - lib, - flakeRoot, - ... -}: +{ config, pkgs, lib, flakeRoot, ... }: let wallpaperSource = "${flakeRoot}/assets/hyprland/wallpaperstuff"; - wallpaperTarget = "$HOME/.config/wpaperd"; + wallpaperTarget = "${config.home.homeDirectory}/.config/wpaperd"; in { # Install wpaperd system-wide @@ -799,31 +793,31 @@ in # Activation script: copy wallpapers & config to ~/.config/wpaperd system.activationScripts.copyWpaperdConfig = { text = '' - echo "=== Copying wpaperd config to $HOME/.config/wpaperd ===" + echo "=== Copying wpaperd config to ${wallpaperTarget} ===" mkdir -p "${wallpaperTarget}" cp -rT "${wallpaperSource}" "${wallpaperTarget}" + chmod -R 755 "${wallpaperTarget}" echo "Done." ''; - deps = [ ]; + deps = []; }; # User systemd service (runs on login) systemd.user.services.wpaperd = { description = "wpaperd wallpaper daemon"; + wantedBy = [ "default.target" ]; after = [ "default.target" ]; serviceConfig = { Type = "simple"; - ExecStart = "bash -c '${pkgs.wpaperd}/bin/wpaperd --config ${wallpaperTarget}/wallpaper.toml'"; + ExecStart = "${pkgs.wpaperd}/bin/wpaperd --config ${wallpaperTarget}/wallpaper.toml"; Restart = "on-failure"; RestartSec = 1; }; - wantedBy = [ "default.target" ]; enable = true; }; } - #+END_SRC ** =generated/hyprland/notifications/top.nix= diff --git a/Droidnix/generated/hyprland/decorations/rotating_wallpaper.nix b/Droidnix/generated/hyprland/decorations/rotating_wallpaper.nix index 6759c49f0..d6c84bf4f 100644 --- a/Droidnix/generated/hyprland/decorations/rotating_wallpaper.nix +++ b/Droidnix/generated/hyprland/decorations/rotating_wallpaper.nix @@ -1,14 +1,8 @@ -{ - config, - pkgs, - lib, - flakeRoot, - ... -}: +{ config, pkgs, lib, flakeRoot, ... }: let wallpaperSource = "${flakeRoot}/assets/hyprland/wallpaperstuff"; - wallpaperTarget = "$HOME/.config/wpaperd"; + wallpaperTarget = "${config.home.homeDirectory}/.config/wpaperd"; in { # Install wpaperd system-wide @@ -17,27 +11,28 @@ in # Activation script: copy wallpapers & config to ~/.config/wpaperd system.activationScripts.copyWpaperdConfig = { text = '' - echo "=== Copying wpaperd config to $HOME/.config/wpaperd ===" + echo "=== Copying wpaperd config to ${wallpaperTarget} ===" mkdir -p "${wallpaperTarget}" cp -rT "${wallpaperSource}" "${wallpaperTarget}" + chmod -R 755 "${wallpaperTarget}" echo "Done." ''; - deps = [ ]; + deps = []; }; # User systemd service (runs on login) systemd.user.services.wpaperd = { description = "wpaperd wallpaper daemon"; + wantedBy = [ "default.target" ]; after = [ "default.target" ]; serviceConfig = { Type = "simple"; - ExecStart = "bash -c '${pkgs.wpaperd}/bin/wpaperd --config ${wallpaperTarget}/wallpaper.toml'"; + ExecStart = "${pkgs.wpaperd}/bin/wpaperd --config ${wallpaperTarget}/wallpaper.toml"; Restart = "on-failure"; RestartSec = 1; }; - wantedBy = [ "default.target" ]; enable = true; }; }