From 5a471b0fd2bc4aa4b3fefa1bc8a6d8b56335de70 Mon Sep 17 00:00:00 2001 From: "info@data-pro.nu" Date: Sun, 29 Mar 2026 12:22:08 +0000 Subject: [PATCH] Regenerated --- Droidnix/README.html | 628 +++++++++--------- Droidnix/README.org | 52 +- .../Wallpapers/set-wallpapers-at-logon.sh | 44 ++ .../modules/traveldroid/desktop/wallpaper.nix | 52 +- 4 files changed, 404 insertions(+), 372 deletions(-) create mode 100755 Droidnix/assets/traveldroid/Wallpapers/set-wallpapers-at-logon.sh diff --git a/Droidnix/README.html b/Droidnix/README.html index 158e4c8bb..5d68cceb3 100644 --- a/Droidnix/README.html +++ b/Droidnix/README.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + Droidnix: A Dendritic NixOS + Home Manager Configuration NixOS Configuration Structure @@ -204,114 +204,114 @@

Table of Contents

-
-

Shortcuts

-
+
+

Shortcuts

+

Introduction The Assets Folder @@ -327,26 +327,26 @@

Introduction   intro

-
-

What is Droidnix

-
+
+

What is Droidnix

+

Droidnix is a modular, declarative NixOS + Home Manager configuration system. It allows users to choose between Hyprland and Mangowc as their window manager, with shared and WM-specific configurations managed via Emacs Org and Nix Flakes. The project is designed for reproducibility, maintainability, and cross-machine compatibility.

-
-

Installed components:

-
+
+

Installed components:

+
    -
  • Core
  • -
  • Hyprland
  • -
  • Mangowc
  • +
  • Core
  • +
  • Hyprland
  • +
  • Mangowc
-
-

Goals, project Structure, import hierarchy

-
+
+

Goals, project Structure, import hierarchy

+

This project uses a modular NixOS configuration with Hyprland and MangoWC support, designed for literate programming and cross-device reusability. The Droidnix repository is organized into two main parts: @@ -359,9 +359,9 @@ The Droidnix repository is organized into two main parts:

-
-

Root Level

-
+
+

Root Level

+
  • flake.nix is the entry point and imports:
      @@ -372,16 +372,16 @@ The Droidnix repository is organized into two main parts:
-
-

Generated Structure

-
+
+

Generated Structure

+

The generated/ directory contains all generated configurations, divided into three main groups: system, hyprland, and mangowc.

-
-

First Setup

-
+
+

First Setup

+
  1. Clone this repository.
  2. Run the setup script: ./setup_droid.
  3. @@ -411,9 +411,9 @@ The .assets/ folder contains all static files, such as configs, scr This section contains the Org blocks for tangling Nix code into the generated folders.

-
-

flake.nix

-
+
+

flake.nix

+

The Nix flake definition for Droidnix.

@@ -478,9 +478,9 @@ The Nix flake definition for Droidnix.
-
-

generated/hosts/traveldroid/host.nix

-
+
+

generated/hosts/traveldroid/host.nix

+
{ lib, config, pkgs, flakeRoot, import-tree, home-manager, ... }:
 
@@ -536,9 +536,9 @@ in
 
-
-

generated/hosts/traveldroid/hardware-configuration.nix

-
+
+

generated/hosts/traveldroid/hardware-configuration.nix

+
  1. Boot into NixOS Live ISO or your installed system.
  2. Open a terminal.
  3. @@ -596,9 +596,9 @@ in
-
-

generated/hosts/traveldroid/boot.nix

-
+
+

generated/hosts/traveldroid/boot.nix

+
{ config, pkgs, lib, flakeRoot, ... }:
 
@@ -650,17 +650,17 @@ in
 
-
-

Following are the imported modules

+
+

Following are the imported modules

-
-

generated/traveldroid/modules/apps

-
+
+

generated/traveldroid/modules/apps

+
-
-

generated/modules/traveldroid/apps/packages.nix

-
+
+

generated/modules/traveldroid/apps/packages.nix

+

This installs a list of apps

@@ -724,9 +724,9 @@ in {
-
-

generated/assets/packages.conf

-
+
+

generated/assets/packages.conf

+

This is a list of additional apps to install

@@ -787,9 +787,9 @@ vlc
-
-

generated/modules/traveldroid/apps/kitty.nix

-
+
+

generated/modules/traveldroid/apps/kitty.nix

+

This file sets up Kitty terminal

@@ -851,9 +851,9 @@ in
-
-

.config/kitty/Catppuccin-Mocha.conf

-
+
+

.config/kitty/Catppuccin-Mocha.conf

+

These are config files for .config/kitty

@@ -944,9 +944,9 @@ color15 #a6adc8
-
-

.config/kitty/kitty.conf

-
+
+

.config/kitty/kitty.conf

+

These are config files for .config/kitty

@@ -968,9 +968,9 @@ font_size 10.0
-
-

generated/modules/traveldroid/apps/starship.nix

-
+
+

generated/modules/traveldroid/apps/starship.nix

+

This file sets up starship prompt

@@ -1010,9 +1010,9 @@ in
-
-

.config/starship.toml

-
+
+

.config/starship.toml

+

These are config files for .config

@@ -1301,9 +1301,9 @@ crust = "#181926"
-
-

generated/modules/traveldroid/apps/thunar.nix

-
+
+

generated/modules/traveldroid/apps/thunar.nix

+

This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder

@@ -1343,9 +1343,9 @@ in
-
-

generated/modules/traveldroid/apps/wofi.nix

-
+
+

generated/modules/traveldroid/apps/wofi.nix

+

This is the install for Wofi, the launcher

@@ -1378,9 +1378,9 @@ in
-
-

.config/wofi/config

-
+
+

.config/wofi/config

+

These are config files for .config/wofi

@@ -1427,9 +1427,9 @@ prompt = >
-
-

.config/wofi/style.css

-
+
+

.config/wofi/style.css

+

These are config files for .config/wofi

@@ -1518,9 +1518,9 @@ These are config files for .config/wofi
-
-

generated/modules/traveldroid/apps/zenbrowser.nix

-
+
+

generated/modules/traveldroid/apps/zenbrowser.nix

+

This installs zen browser

@@ -1540,9 +1540,9 @@ in
-
-

generated/modules/traveldroid/apps/zsh.nix

-
+
+

generated/modules/traveldroid/apps/zsh.nix

+

This sets up the zsh in the terminal

@@ -1598,9 +1598,9 @@ in
-
-

=generated/.config/zsh/.zshrc

-
+
+

=generated/.config/zsh/.zshrc

+

This sets up the zsh in the terminal

@@ -1635,9 +1635,9 @@ fi
-
-

generated/modules/traveldroid/apps/emacs/emacs.nix

-
+
+

generated/modules/traveldroid/apps/emacs/emacs.nix

+

This installs emacs

@@ -1733,9 +1733,9 @@ in
-
-

generated/.config/emacs/early-init.el

-
+
+

generated/.config/emacs/early-init.el

+

This contaions emacs

@@ -1836,9 +1836,9 @@ package-archive-priorities '(("gnu" . 99)
-
-

generated/.config/emacs/init.el

-
+
+

generated/.config/emacs/init.el

+

This contaions emacs

@@ -2249,13 +2249,13 @@ the top of the file."
-
-

generated/modules/traveldroid/desktop

-
+
+

generated/modules/traveldroid/desktop

+
-
-

generated/modules/traveldroid/desktop/fonts.nix

-
+
+

generated/modules/traveldroid/desktop/fonts.nix

+

This file installs and configures fonts

@@ -2273,9 +2273,9 @@ This file installs and configures fonts
-
-

generated/modules/traveldroid/desktop/gtk.nix

-
+
+

generated/modules/traveldroid/desktop/gtk.nix

+

Setting up GTK

@@ -2301,9 +2301,9 @@ in
-
-

generated/modules/traveldroid/desktop/hyprland.nix

-
+
+

generated/modules/traveldroid/desktop/hyprland.nix

+

Setting up Hyprland

@@ -2350,9 +2350,9 @@ in
-
-

.config/hypr/animations.conf

-
+
+

.config/hypr/animations.conf

+

These are config files for .config/hypr

@@ -2373,9 +2373,9 @@ animations {
-
-

.config/hypr/behaviour.conf

-
+
+

.config/hypr/behaviour.conf

+

These are config files for .config/hypr

@@ -2417,9 +2417,9 @@ misc {
-
-

.config/hypr/bindings.conf

-
+
+

.config/hypr/bindings.conf

+

These are config files for .config/hypr

@@ -2582,9 +2582,9 @@ bind = $mainMod, W, exec, zen
-
-

.config/hypr/exec-once.conf

-
+
+

.config/hypr/exec-once.conf

+

These are config files for .config/hypr

@@ -2598,9 +2598,9 @@ exec-once = bash -c "sleep 5 && waybar"
-
-

.config/hypr/hypridle.conf

-
+
+

.config/hypr/hypridle.conf

+

These are config files for .config/hypr

@@ -2625,9 +2625,9 @@ listener {
-
-

.config/hypr/hyprland.conf

-
+
+

.config/hypr/hyprland.conf

+

These are config files for .config/hypr

@@ -2674,9 +2674,9 @@ misc {
-
-

.config/hypr/hyprlock.conf

-
+
+

.config/hypr/hyprlock.conf

+

These are config files for .config/hypr

@@ -2717,9 +2717,9 @@ label {
-
-

.config/hypr/layer-rules.conf

-
+
+

.config/hypr/layer-rules.conf

+

These are config files for .config/hypr

@@ -2734,9 +2734,9 @@ layerrule = blur on, ignore_alpha 1, match:namespace swaync-notification-window
-
-

.config/hypr/layout.conf

-
+
+

.config/hypr/layout.conf

+

These are config files for .config/hypr

@@ -2746,9 +2746,9 @@ These are config files for .config/hypr
-
-

.config/hypr/monitor-rules.conf

-
+
+

.config/hypr/monitor-rules.conf

+

These are config files for .config/hypr

@@ -2759,9 +2759,9 @@ monitor=DP-1,3840x1080@144,1920x0,1
-
-

.config/hypr/scripts/layout-selector.sh

-
+
+

.config/hypr/scripts/layout-selector.sh

+

These are config files for .config/hypr/scripts

@@ -2804,9 +2804,9 @@ hyprctl dispatch oSD "Layout: $LAYOUT_NAME" 2000
-
-

.config/hypr/theming.css

-
+
+

.config/hypr/theming.css

+

These are config files for .config/hypr

@@ -2855,9 +2855,9 @@ decoration {
-
-

.config/hypr/window-rules.conf

-
+
+

.config/hypr/window-rules.conf

+

These are config files for .config/hypr

@@ -2881,9 +2881,9 @@ windowrulev2 = floatclass:Wofi,opacity:0.9,blur:15
-
-

.config/hypr/workspace-rules.conf

-
+
+

.config/hypr/workspace-rules.conf

+

These are config files for .config/hypr

@@ -2931,24 +2931,22 @@ workspace {
-
-

generated/modules/traveldroid/desktop/wallpaper.nix

-
+
+

generated/modules/traveldroid/desktop/wallpaper.nix

+

Setting up wallpaper engine + wallpaper gui

-
{ config, pkgs, lib, ... }:
+
{ config, pkgs, flakeRoot, ... }:
 
 let
-  username = config.defaultUser or "henrov";
-  homeDir  = "/home/${username}";
-  wallpaperDir = "${homeDir}/Wallpapers";
-  scriptDest  = "${homeDir}/Wallpapers/wallpaper-sync-and-set.sh";
+  homeDir    = "/home/${config.users.users."traveldroid".name or "traveldroid"}";
+  scriptFile = "${homeDir}/Wallpapers/script/set-wallpapers-at-logon.sh";
 in
 {
   ############################
-  # Systemwide packages
+  # System-wide packages
   ############################
   environment.systemPackages = with pkgs; [
     swww
@@ -2958,45 +2956,43 @@ in
   ];
 
   ############################
-  # Install the script
-  ############################
-  home.file."Wallpapers/wallpaper-sync-and-set.sh".source = ./assets/Wallpapers/wallpaper-sync-and-set.sh;
-  home.file."Wallpapers/wallpaper-sync-and-set.sh".executable = true;
-
-  ############################
-  # Systemd user service + timer
+  # User service: run the script
   ############################
   systemd.user.services.wallpaperSync = {
-    description = "2-way sync wallpapers + set random per workspace";
-    serviceConfig.Type = "oneshot";
-    serviceConfig.ExecStart = "${scriptDest}";
-    serviceConfig.Restart = "on-failure";
-  };
+    description = "Run set-wallpapers-at-logon.sh";
 
-  systemd.user.timers.wallpaperSyncTimer = {
-    description = "Run wallpaper sync every hour";
-    wantedBy = [ "timers.target" ];
-    timerConfig.OnCalendar = "hourly";
-    timerConfig.Persistent = true;
+    serviceConfig.Type      = "oneshot";
+    serviceConfig.ExecStart = scriptFile;
+    serviceConfig.Restart   = "on-failure";
   };
 
   ############################
-  # Run at login
+  # Timer: run service every 15 minutes
+  ############################
+  systemd.user.timers.wallpaperSyncTimer = {
+    description              = "Run wallpaperSync service every 15 minutes";
+    wantedBy                 = [ "timers.target" ];
+    timerConfig.OnUnitActiveSec = "15min";
+    timerConfig.Persistent      = true;
+  };
+
+  ############################
+  # Ensure the script runs at login
   ############################
   systemd.user.services.wallpaperSyncLogin = {
-    description = "Run wallpaper sync at login";
-    serviceConfig.Type = "oneshot";
-    serviceConfig.ExecStart = "${scriptDest}";
-    install.WantedBy = [ "default.target" ];
+    description = "Run wallpaperSync at login";
+    wantedBy    = [ "default.target" ];
+    serviceConfig.Type      = "oneshot";
+    serviceConfig.ExecStart = scriptFile;
   };
 }
 
-
-

generated/modules/traveldroid/desktop/stylix.nix

-
+
+

generated/modules/traveldroid/desktop/stylix.nix

+
{ lib, config, pkgs, flakeRoot, stylix, ... }:
 
@@ -3088,9 +3084,9 @@ in
 
-
-

.config/stylix/stylix.conf

-
+
+

.config/stylix/stylix.conf

+

These are config files for .config/stylix

@@ -3127,9 +3123,9 @@ icons = {
-
-

.config/stylix/palette.json

-
+
+

.config/stylix/palette.json

+

These are config files for .config/stylix

@@ -3159,9 +3155,9 @@ These are config files for .config/stylix
-
-

.config/stylix/palette.html

-
+
+

.config/stylix/palette.html

+

These are config files for .config/stylix

@@ -3239,9 +3235,9 @@ These are config files for .config/stylix
-
-

generated/modules/traveldroid/desktop/waybar.nix

-
+
+

generated/modules/traveldroid/desktop/waybar.nix

+

This file installs and configures waybar

@@ -3292,9 +3288,9 @@ in
-
-

.config/waybar/config

-
+
+

.config/waybar/config

+

These are config files for waybar

@@ -3417,9 +3413,9 @@ These are config files for waybar
-
-

.config/waybar/style.css

-
+
+

.config/waybar/style.css

+

These are config files for waybar

@@ -3654,9 +3650,9 @@ window#waybar {
-
-

.config/waypaper/config.ini

-
+
+

.config/waypaper/config.ini

+

These are config files for waypaper

@@ -3693,9 +3689,9 @@ keybindings = ~/.config/waypaper/keybindings.ini
-
-

generated/modules/traveldroid/desktop/wayland.nix

-
+
+

generated/modules/traveldroid/desktop/wayland.nix

+
{ lib, config, pkgs, ... }:
 
@@ -3725,9 +3721,9 @@ keybindings = ~/.config/waypaper/keybindings.ini
 
-
-

generated/modules/traveldroid/desktop/xdg.nix

-
+
+

generated/modules/traveldroid/desktop/xdg.nix

+

This sets the XDG implementation

@@ -3780,13 +3776,13 @@ in
-
-

generated/modules/traveldroid/system

-
+
+

generated/modules/traveldroid/system

+
-
-

generated/modules/traveldroid/system/bluetooth.nix

-
+
+

generated/modules/traveldroid/system/bluetooth.nix

+
{ lib, config, pkgs, flakeRoot, home-manager, ... }:
 
@@ -3827,9 +3823,9 @@ in
 
-
-

generated/modules/traveldroid/system/dbus.nix

-
+
+

generated/modules/traveldroid/system/dbus.nix

+

This sets the dbus implementation

@@ -3856,9 +3852,9 @@ This sets the dbus implementation
-
-

generated/modules/traveldroid/system/login-tuigreet.nix

-
+
+

generated/modules/traveldroid/system/login-tuigreet.nix

+

This sets up tuigreeter which is not fancy but imo fits the aesthetic I am aiming for

@@ -3912,9 +3908,9 @@ in
-
-

generated/modules/traveldroid/system/networking.nix

-
+
+

generated/modules/traveldroid/system/networking.nix

+

This sets the networking.

@@ -3978,9 +3974,9 @@ This sets the networking.
-
-

generated/modules/traveldroid/system/nix.nix

-
+
+

generated/modules/traveldroid/system/nix.nix

+
{ lib, config, ... }:
 
@@ -3997,13 +3993,13 @@ This sets the networking.
 
-
-

generated/users

-
+
+

generated/users

+
-
-

generated/parked/users/copy_config_2_config.nix

-
+
+

generated/parked/users/copy_config_2_config.nix

+

This copies stuff to the user home-folder

@@ -4054,9 +4050,9 @@ in
-
-

generated/users/henrov.nix

-
+
+

generated/users/henrov.nix

+

This is the default user, just search and replace henrov another name if you want to change

@@ -4111,9 +4107,9 @@ in

These are all the prepared config files

-
-

.config/waybar/style.css

-
+
+

.config/waybar/style.css

+

These are config files for .config/waybar

@@ -4347,9 +4343,9 @@ window#waybar {
-
-

.config/waypaper/config.ini

-
+
+

.config/waypaper/config.ini

+

These are config files for .config/waypaper

@@ -4386,9 +4382,9 @@ keybindings = ~/.config/waypaper/keybindings.ini
-
-

.config/zed/settings.json

-
+
+

.config/zed/settings.json

+

These are config files for .config/zed

@@ -4428,7 +4424,7 @@ These are config files for .config/zed

Author: Henro Veijer

-

Created: 2026-03-29 Sun 12:05

+

Created: 2026-03-29 Sun 12:22

Validate

diff --git a/Droidnix/README.org b/Droidnix/README.org index 00550cf85..adebff100 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -2358,17 +2358,15 @@ workspace { ** =generated/modules/traveldroid/desktop/wallpaper.nix= Setting up wallpaper engine + wallpaper gui #+BEGIN_SRC nix :tangle generated/modules/traveldroid/desktop/wallpaper.nix :noweb yes :mkdirp yes :eval never -{ config, pkgs, lib, ... }: +{ config, pkgs, flakeRoot, ... }: let - username = config.defaultUser or "henrov"; - homeDir = "/home/${username}"; - wallpaperDir = "${homeDir}/Wallpapers"; - scriptDest = "${homeDir}/Wallpapers/wallpaper-sync-and-set.sh"; + homeDir = "/home/${config.users.users."traveldroid".name or "traveldroid"}"; + scriptFile = "${homeDir}/Wallpapers/script/set-wallpapers-at-logon.sh"; in { ############################ - # Systemwide packages + # System-wide packages ############################ environment.systemPackages = with pkgs; [ swww @@ -2378,36 +2376,34 @@ in ]; ############################ - # Install the script - ############################ - home.file."Wallpapers/wallpaper-sync-and-set.sh".source = ./assets/Wallpapers/wallpaper-sync-and-set.sh; - home.file."Wallpapers/wallpaper-sync-and-set.sh".executable = true; - - ############################ - # Systemd user service + timer + # User service: run the script ############################ systemd.user.services.wallpaperSync = { - description = "2-way sync wallpapers + set random per workspace"; - serviceConfig.Type = "oneshot"; - serviceConfig.ExecStart = "${scriptDest}"; - serviceConfig.Restart = "on-failure"; - }; + description = "Run set-wallpapers-at-logon.sh"; - systemd.user.timers.wallpaperSyncTimer = { - description = "Run wallpaper sync every hour"; - wantedBy = [ "timers.target" ]; - timerConfig.OnCalendar = "hourly"; - timerConfig.Persistent = true; + serviceConfig.Type = "oneshot"; + serviceConfig.ExecStart = scriptFile; + serviceConfig.Restart = "on-failure"; }; ############################ - # Run at login + # Timer: run service every 15 minutes + ############################ + systemd.user.timers.wallpaperSyncTimer = { + description = "Run wallpaperSync service every 15 minutes"; + wantedBy = [ "timers.target" ]; + timerConfig.OnUnitActiveSec = "15min"; + timerConfig.Persistent = true; + }; + + ############################ + # Ensure the script runs at login ############################ systemd.user.services.wallpaperSyncLogin = { - description = "Run wallpaper sync at login"; - serviceConfig.Type = "oneshot"; - serviceConfig.ExecStart = "${scriptDest}"; - install.WantedBy = [ "default.target" ]; + description = "Run wallpaperSync at login"; + wantedBy = [ "default.target" ]; + serviceConfig.Type = "oneshot"; + serviceConfig.ExecStart = scriptFile; }; } #+END_SRC diff --git a/Droidnix/assets/traveldroid/Wallpapers/set-wallpapers-at-logon.sh b/Droidnix/assets/traveldroid/Wallpapers/set-wallpapers-at-logon.sh new file mode 100755 index 000000000..3e8a3ea78 --- /dev/null +++ b/Droidnix/assets/traveldroid/Wallpapers/set-wallpapers-at-logon.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env bash +set -euo pipefail + +# ----------------------------- +# CONFIGURATION +# ----------------------------- +# Repo path (first argument), fallback to current dir +REPO_DIR="${1:-$HOME/myrepo}" +SRC_WALLPAPERS="$REPO_DIR/assets/Wallpapers" +DST_WALLPAPERS="$HOME/Wallpapers" +PICTURES_DIR="$DST_WALLPAPERS/pictures" + +# ----------------------------- +# 2-WAY SYNC (only add/update, never delete) +# ----------------------------- +mkdir -p "$DST_WALLPAPERS" +mkdir -p "$PICTURES_DIR" + +# Sync from repo -> home (add/update) +rsync -au --ignore-existing "$SRC_WALLPAPERS/" "$DST_WALLPAPERS/" + +# Sync from home -> repo (add only, no deletion) +rsync -au --ignore-existing "$DST_WALLPAPERS/" "$SRC_WALLPAPERS/" + +# ----------------------------- +# Set random wallpaper per workspace +# ----------------------------- +# Get list of images +mapfile -t IMAGES < <(find "$PICTURES_DIR" -type f \( -iname '*.png' -o -iname '*.jpg' -o -iname '*.jpeg' \)) + +if [ "${#IMAGES[@]}" -eq 0 ]; then + echo "No images found in $PICTURES_DIR" + exit 1 +fi + +# Get number of workspaces (Hyprland / swww) +NUM_WORKSPACES=$(hyprctl workspaces | wc -l) + +for ws in $(seq 1 "$NUM_WORKSPACES"); do + # Pick a random image + RAND_IMAGE="${IMAGES[RANDOM % ${#IMAGES[@]}]}" + # Set wallpaper for workspace + swww img "$RAND_IMAGE" --no-fade --transition-type none --workspace "$ws" +done \ No newline at end of file diff --git a/Droidnix/generated/modules/traveldroid/desktop/wallpaper.nix b/Droidnix/generated/modules/traveldroid/desktop/wallpaper.nix index 75a69ad14..79e3bc510 100644 --- a/Droidnix/generated/modules/traveldroid/desktop/wallpaper.nix +++ b/Droidnix/generated/modules/traveldroid/desktop/wallpaper.nix @@ -1,14 +1,12 @@ -{ config, pkgs, lib, ... }: +{ config, pkgs, flakeRoot, ... }: let - username = config.defaultUser or "henrov"; - homeDir = "/home/${username}"; - wallpaperDir = "${homeDir}/Wallpapers"; - scriptDest = "${homeDir}/Wallpapers/wallpaper-sync-and-set.sh"; + homeDir = "/home/${config.users.users."traveldroid".name or "traveldroid"}"; + scriptFile = "${homeDir}/Wallpapers/script/set-wallpapers-at-logon.sh"; in { ############################ - # Systemwide packages + # System-wide packages ############################ environment.systemPackages = with pkgs; [ swww @@ -18,35 +16,33 @@ in ]; ############################ - # Install the script - ############################ - home.file."Wallpapers/wallpaper-sync-and-set.sh".source = ./assets/Wallpapers/wallpaper-sync-and-set.sh; - home.file."Wallpapers/wallpaper-sync-and-set.sh".executable = true; - - ############################ - # Systemd user service + timer + # User service: run the script ############################ systemd.user.services.wallpaperSync = { - description = "2-way sync wallpapers + set random per workspace"; - serviceConfig.Type = "oneshot"; - serviceConfig.ExecStart = "${scriptDest}"; - serviceConfig.Restart = "on-failure"; - }; + description = "Run set-wallpapers-at-logon.sh"; - systemd.user.timers.wallpaperSyncTimer = { - description = "Run wallpaper sync every hour"; - wantedBy = [ "timers.target" ]; - timerConfig.OnCalendar = "hourly"; - timerConfig.Persistent = true; + serviceConfig.Type = "oneshot"; + serviceConfig.ExecStart = scriptFile; + serviceConfig.Restart = "on-failure"; }; ############################ - # Run at login + # Timer: run service every 15 minutes + ############################ + systemd.user.timers.wallpaperSyncTimer = { + description = "Run wallpaperSync service every 15 minutes"; + wantedBy = [ "timers.target" ]; + timerConfig.OnUnitActiveSec = "15min"; + timerConfig.Persistent = true; + }; + + ############################ + # Ensure the script runs at login ############################ systemd.user.services.wallpaperSyncLogin = { - description = "Run wallpaper sync at login"; - serviceConfig.Type = "oneshot"; - serviceConfig.ExecStart = "${scriptDest}"; - install.WantedBy = [ "default.target" ]; + description = "Run wallpaperSync at login"; + wantedBy = [ "default.target" ]; + serviceConfig.Type = "oneshot"; + serviceConfig.ExecStart = scriptFile; }; }