Regenerated

This commit is contained in:
2026-03-29 14:13:49 +00:00
parent 711d612750
commit 93f059cba4
3 changed files with 372 additions and 426 deletions
+316 -334
View File
File diff suppressed because it is too large Load Diff
+28 -46
View File
@@ -2361,7 +2361,7 @@ Setting up wallpaper engine + wallpaper gui
{ config, pkgs, lib, flakeRoot, ... }:
let
username = config.defaultUser or "henrov";
username = config.defaultUser or "henrov";
homeDir = "/home/${username}";
wallpaperSrc = "${flakeRoot}/assets/traveldroid/Wallpapers";
wallpaperDst = "${homeDir}/Wallpapers";
@@ -2379,64 +2379,46 @@ in
];
############################
# User systemd service to start swww, sync wallpapers, and run the script
# User systemd service to sync wallpapers and run script
############################
systemd.user.services.wallpaperSync = {
description = "Sync Wallpapers and run set-wallpapers-at-logon.sh";
wants = [ "graphical-session.target" ];
after = [ "graphical-session.target" ];
wants = [ "graphical-session.target" ];
after = [ "graphical-session.target" ];
serviceConfig.Type = "oneshot";
{ config, pkgs, lib, flakeRoot, ... }:
serviceConfig.Type = "oneshot";
let
username = config.defaultUser or "henrov";
homeDir = "/home/${username}";
wallpaperSrc = "${flakeRoot}/assets/traveldroid/Wallpapers";
wallpaperDst = "${homeDir}/Wallpapers";
scriptFile = "${wallpaperDst}/set-wallpapers-at-logon.sh";
in
{
environment.systemPackages = with pkgs; [
swww
waypaper
jq
rsync
];
# Proper shell script invocation
serviceConfig.ExecStart = ''
${pkgs.bash}/bin/bash -c '
# Ensure destination exists
mkdir -p "${wallpaperDst}"
systemd.user.services.wallpaperSync = {
description = "Sync Wallpapers and run set-wallpapers-at-logon.sh";
wants = [ "graphical-session.target" ];
after = [ "graphical-session.target" ];
# Copy all wallpapers
rsync -avu --ignore-existing "${wallpaperSrc}/" "${wallpaperDst}/"
rsync -avu "${wallpaperSrc}/" "${wallpaperDst}/"
serviceConfig.Type = "oneshot";
# Start swww if not running
pgrep swww >/dev/null 2>&1 || swww &
# Use a proper shell script invocation
serviceConfig.ExecStart = ''
${pkgs.bash}/bin/bash -c '
mkdir -p "${wallpaperDst}"
rsync -avu --ignore-existing "${wallpaperSrc}/" "${wallpaperDst}/"
rsync -avu "${wallpaperSrc}/" "${wallpaperDst}/"
# Start swww if not running
pgrep swww >/dev/null 2>&1 || swww &
# Run the logon wallpaper script if executable
if [ -x "${scriptFile}" ]; then
"${scriptFile}"
fi
'
'';
# Run the logon wallpaper script if executable
if [ -x "${scriptFile}" ]; then
"${scriptFile}"
fi
'
'';
serviceConfig.Restart = "on-failure";
};
############################
# Timer to run the service every 15 minutes
############################
systemd.user.timers.wallpaperSyncTimer = {
description = "Run wallpaperSync service every 15 minutes";
wantedBy = [ "timers.target" ];
timerConfig.OnBootSec = "1min";
timerConfig.OnUnitActiveSec = "15min";
timerConfig.Persistent = true;
description = "Run wallpaperSync service every 15 minutes";
wantedBy = [ "timers.target" ];
timerConfig.OnBootSec = "1min";
timerConfig.OnUnitActiveSec = "15min";
timerConfig.Persistent = true;
};
}
#+END_SRC
@@ -1,7 +1,7 @@
{ config, pkgs, lib, flakeRoot, ... }:
let
username = config.defaultUser or "henrov";
username = config.defaultUser or "henrov";
homeDir = "/home/${username}";
wallpaperSrc = "${flakeRoot}/assets/traveldroid/Wallpapers";
wallpaperDst = "${homeDir}/Wallpapers";
@@ -19,63 +19,45 @@ in
];
############################
# User systemd service to start swww, sync wallpapers, and run the script
# User systemd service to sync wallpapers and run script
############################
systemd.user.services.wallpaperSync = {
description = "Sync Wallpapers and run set-wallpapers-at-logon.sh";
wants = [ "graphical-session.target" ];
after = [ "graphical-session.target" ];
wants = [ "graphical-session.target" ];
after = [ "graphical-session.target" ];
serviceConfig.Type = "oneshot";
{ config, pkgs, lib, flakeRoot, ... }:
serviceConfig.Type = "oneshot";
let
username = config.defaultUser or "henrov";
homeDir = "/home/${username}";
wallpaperSrc = "${flakeRoot}/assets/traveldroid/Wallpapers";
wallpaperDst = "${homeDir}/Wallpapers";
scriptFile = "${wallpaperDst}/set-wallpapers-at-logon.sh";
in
{
environment.systemPackages = with pkgs; [
swww
waypaper
jq
rsync
];
# Proper shell script invocation
serviceConfig.ExecStart = ''
${pkgs.bash}/bin/bash -c '
# Ensure destination exists
mkdir -p "${wallpaperDst}"
systemd.user.services.wallpaperSync = {
description = "Sync Wallpapers and run set-wallpapers-at-logon.sh";
wants = [ "graphical-session.target" ];
after = [ "graphical-session.target" ];
# Copy all wallpapers
rsync -avu --ignore-existing "${wallpaperSrc}/" "${wallpaperDst}/"
rsync -avu "${wallpaperSrc}/" "${wallpaperDst}/"
serviceConfig.Type = "oneshot";
# Start swww if not running
pgrep swww >/dev/null 2>&1 || swww &
# Use a proper shell script invocation
serviceConfig.ExecStart = ''
${pkgs.bash}/bin/bash -c '
mkdir -p "${wallpaperDst}"
rsync -avu --ignore-existing "${wallpaperSrc}/" "${wallpaperDst}/"
rsync -avu "${wallpaperSrc}/" "${wallpaperDst}/"
# Start swww if not running
pgrep swww >/dev/null 2>&1 || swww &
# Run the logon wallpaper script if executable
if [ -x "${scriptFile}" ]; then
"${scriptFile}"
fi
'
'';
# Run the logon wallpaper script if executable
if [ -x "${scriptFile}" ]; then
"${scriptFile}"
fi
'
'';
serviceConfig.Restart = "on-failure";
};
############################
# Timer to run the service every 15 minutes
############################
systemd.user.timers.wallpaperSyncTimer = {
description = "Run wallpaperSync service every 15 minutes";
wantedBy = [ "timers.target" ];
timerConfig.OnBootSec = "1min";
timerConfig.OnUnitActiveSec = "15min";
timerConfig.Persistent = true;
description = "Run wallpaperSync service every 15 minutes";
wantedBy = [ "timers.target" ];
timerConfig.OnBootSec = "1min";
timerConfig.OnUnitActiveSec = "15min";
timerConfig.Persistent = true;
};
}