Regenerated
This commit is contained in:
+3
-14
@@ -719,9 +719,9 @@ in
|
|||||||
}
|
}
|
||||||
#+END_SRC
|
#+END_SRC
|
||||||
|
|
||||||
** =generated/modules/traveldroid/desktop/rotating_wallpaper.nix=
|
** =generated/modules/traveldroid/desktop/wallpaper.nix=
|
||||||
Setting up wallpaper engine + wall[pa[per gui
|
Setting up wallpaper engine + wall[pa[per gui
|
||||||
#+BEGIN_SRC nix :tangle generated/modules/traveldroid/desktop/rotating_wallpaper.nix :noweb tangle :mkdirp yes :eval never-html
|
#+BEGIN_SRC nix :tangle generated/modules/traveldroid/desktop/wallpaper.nix :noweb tangle :mkdirp yes :eval never-html
|
||||||
{ lib, config, pkgs, flakeRoot, ... }:
|
{ lib, config, pkgs, flakeRoot, ... }:
|
||||||
let
|
let
|
||||||
username = config.defaultUser or "henrov";
|
username = config.defaultUser or "henrov";
|
||||||
@@ -747,32 +747,23 @@ in
|
|||||||
|
|
||||||
systemd.services.copyWallpaperStuff = {
|
systemd.services.copyWallpaperStuff = {
|
||||||
description = "Copy wallpaper assets to user home";
|
description = "Copy wallpaper assets to user home";
|
||||||
|
|
||||||
wantedBy = [ "multi-user.target" ];
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
|
||||||
# 🔑 CRITICAL FIX
|
|
||||||
after = [ "systemd-user-sessions.service" ];
|
after = [ "systemd-user-sessions.service" ];
|
||||||
wants = [ "systemd-user-sessions.service" ];
|
wants = [ "systemd-user-sessions.service" ];
|
||||||
|
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
Type = "oneshot";
|
Type = "oneshot";
|
||||||
};
|
};
|
||||||
|
|
||||||
script = ''
|
script = ''
|
||||||
# Wait until user exists (robust)
|
# Wait until user exists (robust)
|
||||||
for i in $(seq 1 10); do
|
for i in $(seq 1 10); do
|
||||||
id ${username} && break
|
id ${username} && break
|
||||||
sleep 1
|
sleep 1
|
||||||
done
|
done
|
||||||
|
|
||||||
mkdir -p "${wallpaperDst}"
|
mkdir -p "${wallpaperDst}"
|
||||||
|
|
||||||
# Copy only if empty (prevents overwrite)
|
# Copy only if empty (prevents overwrite)
|
||||||
if [ -z "$(ls -A ${wallpaperDst})" ]; then
|
if [ -z "$(ls -A ${wallpaperDst})" ]; then
|
||||||
cp -r ${wallpaperSrc}/* "${wallpaperDst}/"
|
cp -r ${wallpaperSrc}/* "${wallpaperDst}/"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 🔑 FIX: use user only, not group
|
|
||||||
chown -R ${username} "${wallpaperDst}"
|
chown -R ${username} "${wallpaperDst}"
|
||||||
chmod -R u+rwx "${wallpaperDst}"
|
chmod -R u+rwx "${wallpaperDst}"
|
||||||
'';
|
'';
|
||||||
@@ -781,7 +772,6 @@ in
|
|||||||
#################################
|
#################################
|
||||||
# Home Manager integration
|
# Home Manager integration
|
||||||
#################################
|
#################################
|
||||||
|
|
||||||
_module.args.hmUsers = {
|
_module.args.hmUsers = {
|
||||||
${username} = {
|
${username} = {
|
||||||
|
|
||||||
@@ -793,7 +783,6 @@ in
|
|||||||
#################################
|
#################################
|
||||||
# swww daemon
|
# swww daemon
|
||||||
#################################
|
#################################
|
||||||
|
|
||||||
systemd.user.services.swww-daemon = {
|
systemd.user.services.swww-daemon = {
|
||||||
Unit = {
|
Unit = {
|
||||||
Description = "swww wallpaper daemon";
|
Description = "swww wallpaper daemon";
|
||||||
@@ -823,7 +812,7 @@ in
|
|||||||
Service = {
|
Service = {
|
||||||
Type = "oneshot";
|
Type = "oneshot";
|
||||||
ExecStart = ''
|
ExecStart = ''
|
||||||
${pkgs.swww}/bin/swww img ${wallpaperDst}/* --transition-type any
|
${pkgs.swww}/bin/swww img ${wallpaperDst} --transition-type fade slide blend zoom wipe cube fade-zoom slide-zoom
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 270 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 173 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 136 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 149 KiB |
+1
-12
@@ -23,32 +23,23 @@ in
|
|||||||
|
|
||||||
systemd.services.copyWallpaperStuff = {
|
systemd.services.copyWallpaperStuff = {
|
||||||
description = "Copy wallpaper assets to user home";
|
description = "Copy wallpaper assets to user home";
|
||||||
|
|
||||||
wantedBy = [ "multi-user.target" ];
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
|
||||||
# 🔑 CRITICAL FIX
|
|
||||||
after = [ "systemd-user-sessions.service" ];
|
after = [ "systemd-user-sessions.service" ];
|
||||||
wants = [ "systemd-user-sessions.service" ];
|
wants = [ "systemd-user-sessions.service" ];
|
||||||
|
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
Type = "oneshot";
|
Type = "oneshot";
|
||||||
};
|
};
|
||||||
|
|
||||||
script = ''
|
script = ''
|
||||||
# Wait until user exists (robust)
|
# Wait until user exists (robust)
|
||||||
for i in $(seq 1 10); do
|
for i in $(seq 1 10); do
|
||||||
id ${username} && break
|
id ${username} && break
|
||||||
sleep 1
|
sleep 1
|
||||||
done
|
done
|
||||||
|
|
||||||
mkdir -p "${wallpaperDst}"
|
mkdir -p "${wallpaperDst}"
|
||||||
|
|
||||||
# Copy only if empty (prevents overwrite)
|
# Copy only if empty (prevents overwrite)
|
||||||
if [ -z "$(ls -A ${wallpaperDst})" ]; then
|
if [ -z "$(ls -A ${wallpaperDst})" ]; then
|
||||||
cp -r ${wallpaperSrc}/* "${wallpaperDst}/"
|
cp -r ${wallpaperSrc}/* "${wallpaperDst}/"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 🔑 FIX: use user only, not group
|
|
||||||
chown -R ${username} "${wallpaperDst}"
|
chown -R ${username} "${wallpaperDst}"
|
||||||
chmod -R u+rwx "${wallpaperDst}"
|
chmod -R u+rwx "${wallpaperDst}"
|
||||||
'';
|
'';
|
||||||
@@ -57,7 +48,6 @@ in
|
|||||||
#################################
|
#################################
|
||||||
# Home Manager integration
|
# Home Manager integration
|
||||||
#################################
|
#################################
|
||||||
|
|
||||||
_module.args.hmUsers = {
|
_module.args.hmUsers = {
|
||||||
${username} = {
|
${username} = {
|
||||||
|
|
||||||
@@ -69,7 +59,6 @@ in
|
|||||||
#################################
|
#################################
|
||||||
# swww daemon
|
# swww daemon
|
||||||
#################################
|
#################################
|
||||||
|
|
||||||
systemd.user.services.swww-daemon = {
|
systemd.user.services.swww-daemon = {
|
||||||
Unit = {
|
Unit = {
|
||||||
Description = "swww wallpaper daemon";
|
Description = "swww wallpaper daemon";
|
||||||
@@ -99,7 +88,7 @@ in
|
|||||||
Service = {
|
Service = {
|
||||||
Type = "oneshot";
|
Type = "oneshot";
|
||||||
ExecStart = ''
|
ExecStart = ''
|
||||||
${pkgs.swww}/bin/swww img ${wallpaperDst}/* --transition-type any
|
${pkgs.swww}/bin/swww img ${wallpaperDst} --transition-type fade slide blend zoom wipe cube fade-zoom slide-zoom
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
Reference in New Issue
Block a user