Regenerated
This commit is contained in:
+305
-298
File diff suppressed because it is too large
Load Diff
+17
-10
@@ -2361,7 +2361,7 @@ Setting up wallpaper engine + wallpaper gui
|
|||||||
{ config, pkgs, flakeRoot, ... }:
|
{ config, pkgs, flakeRoot, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
username = config.defaultUser or "henrov";
|
username = config.defaultUser or "henrov";
|
||||||
homeDir = "/home/${username}";
|
homeDir = "/home/${username}";
|
||||||
scriptFile = "${homeDir}/Wallpapers/set-wallpapers-at-logon.sh";
|
scriptFile = "${homeDir}/Wallpapers/set-wallpapers-at-logon.sh";
|
||||||
in
|
in
|
||||||
@@ -2382,23 +2382,27 @@ in
|
|||||||
systemd.user.services.swwwDaemon = {
|
systemd.user.services.swwwDaemon = {
|
||||||
description = "swww wallpaper daemon";
|
description = "swww wallpaper daemon";
|
||||||
after = [ "graphical-session.target" ];
|
after = [ "graphical-session.target" ];
|
||||||
|
wantedBy = [ "default.target" ];
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
ExecStart = "${pkgs.swww}/bin/swww daemon";
|
ExecStart = "${pkgs.swww}/bin/swww daemon";
|
||||||
Restart = "always";
|
Restart = "always";
|
||||||
Type = "simple";
|
Type = "simple";
|
||||||
};
|
};
|
||||||
wantedBy = [ "default.target" ];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
############################
|
############################
|
||||||
# User service: run the script
|
# User service: run the wallpaper script
|
||||||
############################
|
############################
|
||||||
systemd.user.services.wallpaperSync = {
|
systemd.user.services.wallpaperSync = {
|
||||||
description = "Run set-wallpapers-at-logon.sh";
|
description = "Run set-wallpapers-at-logon.sh";
|
||||||
|
wantedBy = [ "default.target" ];
|
||||||
serviceConfig.Type = "oneshot";
|
serviceConfig = {
|
||||||
serviceConfig.ExecStart = "export PATH=$PATH:/run/current-system/sw/bin /run/current-system/sw/bin/bash ${scriptFile}";
|
Type = "oneshot";
|
||||||
serviceConfig.Restart = "on-failure";
|
# Ensure Nix binaries are in PATH
|
||||||
|
Environment = "PATH=/run/current-system/sw/bin:/usr/bin:/bin";
|
||||||
|
ExecStart = "${pkgs.bash}/bin/bash ${scriptFile}";
|
||||||
|
Restart = "on-failure";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
############################
|
############################
|
||||||
@@ -2412,13 +2416,16 @@ in
|
|||||||
};
|
};
|
||||||
|
|
||||||
############################
|
############################
|
||||||
# Ensure the script runs at login
|
# Run the script at login
|
||||||
############################
|
############################
|
||||||
systemd.user.services.wallpaperSyncLogin = {
|
systemd.user.services.wallpaperSyncLogin = {
|
||||||
description = "Run wallpaperSync at login";
|
description = "Run wallpaperSync at login";
|
||||||
wantedBy = [ "default.target" ];
|
wantedBy = [ "default.target" ];
|
||||||
serviceConfig.Type = "oneshot";
|
serviceConfig = {
|
||||||
serviceConfig.ExecStart = "export PATH=$PATH:/run/current-system/sw/bin /run/current-system/sw/bin/bash ${scriptFile}";
|
Type = "oneshot";
|
||||||
|
Environment = "PATH=/run/current-system/sw/bin:/usr/bin:/bin";
|
||||||
|
ExecStart = "${pkgs.bash}/bin/bash ${scriptFile}";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
#+END_SRC
|
#+END_SRC
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{ config, pkgs, flakeRoot, ... }:
|
{ config, pkgs, flakeRoot, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
username = config.defaultUser or "henrov";
|
username = config.defaultUser or "henrov";
|
||||||
homeDir = "/home/${username}";
|
homeDir = "/home/${username}";
|
||||||
scriptFile = "${homeDir}/Wallpapers/set-wallpapers-at-logon.sh";
|
scriptFile = "${homeDir}/Wallpapers/set-wallpapers-at-logon.sh";
|
||||||
in
|
in
|
||||||
@@ -22,23 +22,27 @@ in
|
|||||||
systemd.user.services.swwwDaemon = {
|
systemd.user.services.swwwDaemon = {
|
||||||
description = "swww wallpaper daemon";
|
description = "swww wallpaper daemon";
|
||||||
after = [ "graphical-session.target" ];
|
after = [ "graphical-session.target" ];
|
||||||
|
wantedBy = [ "default.target" ];
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
ExecStart = "${pkgs.swww}/bin/swww daemon";
|
ExecStart = "${pkgs.swww}/bin/swww daemon";
|
||||||
Restart = "always";
|
Restart = "always";
|
||||||
Type = "simple";
|
Type = "simple";
|
||||||
};
|
};
|
||||||
wantedBy = [ "default.target" ];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
############################
|
############################
|
||||||
# User service: run the script
|
# User service: run the wallpaper script
|
||||||
############################
|
############################
|
||||||
systemd.user.services.wallpaperSync = {
|
systemd.user.services.wallpaperSync = {
|
||||||
description = "Run set-wallpapers-at-logon.sh";
|
description = "Run set-wallpapers-at-logon.sh";
|
||||||
|
wantedBy = [ "default.target" ];
|
||||||
serviceConfig.Type = "oneshot";
|
serviceConfig = {
|
||||||
serviceConfig.ExecStart = "export PATH=$PATH:/run/current-system/sw/bin /run/current-system/sw/bin/bash ${scriptFile}";
|
Type = "oneshot";
|
||||||
serviceConfig.Restart = "on-failure";
|
# Ensure Nix binaries are in PATH
|
||||||
|
Environment = "PATH=/run/current-system/sw/bin:/usr/bin:/bin";
|
||||||
|
ExecStart = "${pkgs.bash}/bin/bash ${scriptFile}";
|
||||||
|
Restart = "on-failure";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
############################
|
############################
|
||||||
@@ -52,12 +56,15 @@ in
|
|||||||
};
|
};
|
||||||
|
|
||||||
############################
|
############################
|
||||||
# Ensure the script runs at login
|
# Run the script at login
|
||||||
############################
|
############################
|
||||||
systemd.user.services.wallpaperSyncLogin = {
|
systemd.user.services.wallpaperSyncLogin = {
|
||||||
description = "Run wallpaperSync at login";
|
description = "Run wallpaperSync at login";
|
||||||
wantedBy = [ "default.target" ];
|
wantedBy = [ "default.target" ];
|
||||||
serviceConfig.Type = "oneshot";
|
serviceConfig = {
|
||||||
serviceConfig.ExecStart = "export PATH=$PATH:/run/current-system/sw/bin /run/current-system/sw/bin/bash ${scriptFile}";
|
Type = "oneshot";
|
||||||
|
Environment = "PATH=/run/current-system/sw/bin:/usr/bin:/bin";
|
||||||
|
ExecStart = "${pkgs.bash}/bin/bash ${scriptFile}";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user