Regenerated
This commit is contained in:
+313
-299
File diff suppressed because it is too large
Load Diff
+25
-11
@@ -2364,6 +2364,7 @@ let
|
||||
username = config.defaultUser or "henrov";
|
||||
homeDir = "/home/${username}";
|
||||
scriptFile = "${homeDir}/Wallpapers/set-wallpapers-at-logon.sh";
|
||||
socketFile = "/run/user/${config.users.users.${username}.uid or 1000}/wayland-1-swww-daemon.1.sock";
|
||||
in
|
||||
{
|
||||
############################
|
||||
@@ -2382,7 +2383,7 @@ in
|
||||
systemd.user.services.swwwDaemon = {
|
||||
description = "swww wallpaper daemon";
|
||||
after = [ "graphical-session.target" ];
|
||||
wantedBy = [ "default.target" ];
|
||||
wantedBy = [ "default.target" ];
|
||||
serviceConfig = {
|
||||
ExecStart = "${pkgs.swww}/bin/swww daemon";
|
||||
Restart = "always";
|
||||
@@ -2391,15 +2392,25 @@ in
|
||||
};
|
||||
|
||||
############################
|
||||
# User service: run the wallpaper script
|
||||
# Run the wallpaper script at login
|
||||
############################
|
||||
systemd.user.services.wallpaperSync = {
|
||||
description = "Run set-wallpapers-at-logon.sh";
|
||||
wantedBy = [ "default.target" ];
|
||||
systemd.user.services.wallpaperSyncLogin = {
|
||||
description = "Run wallpaper script at login";
|
||||
wantedBy = [ "default.target" ];
|
||||
after = [ "swwwDaemon.service" ];
|
||||
requires = [ "swwwDaemon.service" ];
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
# Ensure Nix binaries are in PATH
|
||||
Type = "oneshot";
|
||||
Environment = "PATH=/run/current-system/sw/bin:/usr/bin:/bin";
|
||||
# Wait for the swww socket
|
||||
ExecStartPre = ''
|
||||
for i in $(seq 1 10); do
|
||||
[ -S ${socketFile} ] && exit 0
|
||||
sleep 0.5
|
||||
done
|
||||
echo "swww daemon socket not found, aborting"
|
||||
exit 1
|
||||
'';
|
||||
ExecStart = "${pkgs.bash}/bin/bash ${scriptFile}";
|
||||
Restart = "on-failure";
|
||||
};
|
||||
@@ -2416,15 +2427,18 @@ in
|
||||
};
|
||||
|
||||
############################
|
||||
# Run the script at login
|
||||
# Run the script every 15 min
|
||||
############################
|
||||
systemd.user.services.wallpaperSyncLogin = {
|
||||
description = "Run wallpaperSync at login";
|
||||
wantedBy = [ "default.target" ];
|
||||
systemd.user.services.wallpaperSync = {
|
||||
description = "Run wallpaper script periodically";
|
||||
wantedBy = [ "default.target" ];
|
||||
after = [ "swwwDaemon.service" ];
|
||||
requires = [ "swwwDaemon.service" ];
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
Environment = "PATH=/run/current-system/sw/bin:/usr/bin:/bin";
|
||||
ExecStart = "${pkgs.bash}/bin/bash ${scriptFile}";
|
||||
Restart = "on-failure";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@ let
|
||||
username = config.defaultUser or "henrov";
|
||||
homeDir = "/home/${username}";
|
||||
scriptFile = "${homeDir}/Wallpapers/set-wallpapers-at-logon.sh";
|
||||
socketFile = "/run/user/${config.users.users.${username}.uid or 1000}/wayland-1-swww-daemon.1.sock";
|
||||
in
|
||||
{
|
||||
############################
|
||||
@@ -22,7 +23,7 @@ in
|
||||
systemd.user.services.swwwDaemon = {
|
||||
description = "swww wallpaper daemon";
|
||||
after = [ "graphical-session.target" ];
|
||||
wantedBy = [ "default.target" ];
|
||||
wantedBy = [ "default.target" ];
|
||||
serviceConfig = {
|
||||
ExecStart = "${pkgs.swww}/bin/swww daemon";
|
||||
Restart = "always";
|
||||
@@ -31,15 +32,25 @@ in
|
||||
};
|
||||
|
||||
############################
|
||||
# User service: run the wallpaper script
|
||||
# Run the wallpaper script at login
|
||||
############################
|
||||
systemd.user.services.wallpaperSync = {
|
||||
description = "Run set-wallpapers-at-logon.sh";
|
||||
wantedBy = [ "default.target" ];
|
||||
systemd.user.services.wallpaperSyncLogin = {
|
||||
description = "Run wallpaper script at login";
|
||||
wantedBy = [ "default.target" ];
|
||||
after = [ "swwwDaemon.service" ];
|
||||
requires = [ "swwwDaemon.service" ];
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
# Ensure Nix binaries are in PATH
|
||||
Type = "oneshot";
|
||||
Environment = "PATH=/run/current-system/sw/bin:/usr/bin:/bin";
|
||||
# Wait for the swww socket
|
||||
ExecStartPre = ''
|
||||
for i in $(seq 1 10); do
|
||||
[ -S ${socketFile} ] && exit 0
|
||||
sleep 0.5
|
||||
done
|
||||
echo "swww daemon socket not found, aborting"
|
||||
exit 1
|
||||
'';
|
||||
ExecStart = "${pkgs.bash}/bin/bash ${scriptFile}";
|
||||
Restart = "on-failure";
|
||||
};
|
||||
@@ -56,15 +67,18 @@ in
|
||||
};
|
||||
|
||||
############################
|
||||
# Run the script at login
|
||||
# Run the script every 15 min
|
||||
############################
|
||||
systemd.user.services.wallpaperSyncLogin = {
|
||||
description = "Run wallpaperSync at login";
|
||||
wantedBy = [ "default.target" ];
|
||||
systemd.user.services.wallpaperSync = {
|
||||
description = "Run wallpaper script periodically";
|
||||
wantedBy = [ "default.target" ];
|
||||
after = [ "swwwDaemon.service" ];
|
||||
requires = [ "swwwDaemon.service" ];
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
Environment = "PATH=/run/current-system/sw/bin:/usr/bin:/bin";
|
||||
ExecStart = "${pkgs.bash}/bin/bash ${scriptFile}";
|
||||
Restart = "on-failure";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user