From 0447727946eb80cbfa1d983ee34c0c7be0ea2a43 Mon Sep 17 00:00:00 2001 From: "info@data-pro.nu" Date: Tue, 17 Mar 2026 16:39:29 +0000 Subject: [PATCH] new wallpaperthingie --- Droidnix/README.org | 33 +++++++++++-------- .../decorations/rotating_wallpaper.nix | 32 ++++++++++-------- 2 files changed, 39 insertions(+), 26 deletions(-) diff --git a/Droidnix/README.org b/Droidnix/README.org index 5dbdb4b78..e91f0d443 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -782,16 +782,11 @@ Finally, it creates a systemd user service (wpaperd.service) that automatically #+BEGIN_SRC nix :tangle generated/hyprland/decorations/rotating_wallpaper.nix :noweb tangle :mkdirp yes :eval never-html { lib, config, pkgs, flakeRoot, ... }: -builtins.trace (lib.concatStringsSep "\n" [ - "=== Wallpaper Module Loaded ===" - "Module path: ${toString __curFile}" - "=== End of Module Load Trace ===" -]); - let # Define source and destination paths source_path = "${flakeRoot}/assets/hyprland/wallpaperstuff"; destination_path = "${config.home.homeDirectory}/Droidnix/wallpaperstuff"; + script_path = "${flakeRoot}/assets/hyprland/scripts/copy-wallpapers.sh"; wallpaper_conf = "${flakeRoot}/assets/hyprland/wallpaperstuff/wallpaper.conf"; # Define the script in the let block @@ -812,25 +807,36 @@ let rsync -av --no-group --no-owner "$SOURCE_DIR/" "$DEST_DIR/" echo "Config files copied from $SOURCE_DIR to $DEST_DIR. Symlinks replaced with editable files." ''; + + # Print the script contents during the build + _ = builtins.trace (lib.concatStringsSep "\n" [ + "=== Contents of copy-wallpapers.sh ===" + copy_wallpapers_script + "=== End of copy-wallpapers.sh ===" + ]); in { options = { wallpaper.enable = lib.mkEnableOption "Wallpaper setup"; }; config = lib.mkIf config.wallpaper.enable { - # Write the script to a file for inspection - home-manager.users.${config.home.username}.home.file."~/copy-wallpapers_debug.sh".text = copy_wallpapers_script; - home-manager.users.${config.home.username}.home.file."~/copy-wallpapers_debug.sh".executable = true; + # Print the script contents again in the config block to ensure it's visible + _ = builtins.trace (lib.concatStringsSep "\n" [ + "=== Contents of copy-wallpapers.sh (in config block) ===" + copy_wallpapers_script + "=== End of copy-wallpapers.sh (in config block) ===" + ]); # Use a script to copy all files from source to destination - home-manager.users.${config.home.username}.home.file."${flakeRoot}/assets/hyprland/scripts/copy-wallpapers.sh".text = copy_wallpapers_script; - home-manager.users.${config.home.username}.home.file."${flakeRoot}/assets/hyprland/scripts/copy-wallpapers.sh".executable = true; + home-manager.users.${config.home.username}.home.file."${script_path}".text = copy_wallpapers_script; + home-manager.users.${config.home.username}.home.file."${script_path}".executable = true; # Run the script on activation home-manager.users.${config.home.username}.home.activation.copy-wallpapers.script = '' - "${flakeRoot}/assets/hyprland/scripts/copy-wallpapers.sh" + echo "=== Activation Script Running ===" + cat "${script_path}" + "${script_path}" ''; - # Install wpaperd home-manager.users.${config.home.username}.home.packages = [ pkgs.wpaperd ]; @@ -838,6 +844,7 @@ in { home-manager.users.${config.home.username}.home.file."${config.home.homeDirectory}/.config/wpaperd/config.toml".text = builtins.readFile wallpaper_conf; }; } + #+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 b855d8f86..c772b6907 100644 --- a/Droidnix/generated/hyprland/decorations/rotating_wallpaper.nix +++ b/Droidnix/generated/hyprland/decorations/rotating_wallpaper.nix @@ -1,15 +1,10 @@ { lib, config, pkgs, flakeRoot, ... }: -builtins.trace (lib.concatStringsSep "\n" [ - "=== Wallpaper Module Loaded ===" - "Module path: ${toString __curFile}" - "=== End of Module Load Trace ===" -]); - let # Define source and destination paths source_path = "${flakeRoot}/assets/hyprland/wallpaperstuff"; destination_path = "${config.home.homeDirectory}/Droidnix/wallpaperstuff"; + script_path = "${flakeRoot}/assets/hyprland/scripts/copy-wallpapers.sh"; wallpaper_conf = "${flakeRoot}/assets/hyprland/wallpaperstuff/wallpaper.conf"; # Define the script in the let block @@ -30,25 +25,36 @@ let rsync -av --no-group --no-owner "$SOURCE_DIR/" "$DEST_DIR/" echo "Config files copied from $SOURCE_DIR to $DEST_DIR. Symlinks replaced with editable files." ''; + + # Print the script contents during the build + _ = builtins.trace (lib.concatStringsSep "\n" [ + "=== Contents of copy-wallpapers.sh ===" + copy_wallpapers_script + "=== End of copy-wallpapers.sh ===" + ]); in { options = { wallpaper.enable = lib.mkEnableOption "Wallpaper setup"; }; config = lib.mkIf config.wallpaper.enable { - # Write the script to a file for inspection - home-manager.users.${config.home.username}.home.file."~/copy-wallpapers_debug.sh".text = copy_wallpapers_script; - home-manager.users.${config.home.username}.home.file."~/copy-wallpapers_debug.sh".executable = true; + # Print the script contents again in the config block to ensure it's visible + _ = builtins.trace (lib.concatStringsSep "\n" [ + "=== Contents of copy-wallpapers.sh (in config block) ===" + copy_wallpapers_script + "=== End of copy-wallpapers.sh (in config block) ===" + ]); # Use a script to copy all files from source to destination - home-manager.users.${config.home.username}.home.file."${flakeRoot}/assets/hyprland/scripts/copy-wallpapers.sh".text = copy_wallpapers_script; - home-manager.users.${config.home.username}.home.file."${flakeRoot}/assets/hyprland/scripts/copy-wallpapers.sh".executable = true; + home-manager.users.${config.home.username}.home.file."${script_path}".text = copy_wallpapers_script; + home-manager.users.${config.home.username}.home.file."${script_path}".executable = true; # Run the script on activation home-manager.users.${config.home.username}.home.activation.copy-wallpapers.script = '' - "${flakeRoot}/assets/hyprland/scripts/copy-wallpapers.sh" + echo "=== Activation Script Running ===" + cat "${script_path}" + "${script_path}" ''; - # Install wpaperd home-manager.users.${config.home.username}.home.packages = [ pkgs.wpaperd ];