diff --git a/Droidnix/README.html b/Droidnix/README.html index 41fdb35b5..b33278574 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,25 @@ workspace {
-
-

generated/modules/traveldroid/desktop/wallpaper.nix

-
+
+

generated/modules/traveldroid/desktop/wallpaper.nix

+

Setting up wallpaper engine + wallpaper gui

-
{ config, pkgs, flakeRoot, ... }:
+
{ config, pkgs, lib, flakeRoot, ... }:
 
 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";
+  username    = config.users.users."traveldroid".name or "traveldroid";
+  homeDir     = "/home/${username}";
+  wallpaperSrc = "${flakeRoot}/assets/Wallpapers";
+  wallpaperDst = "${homeDir}/Wallpapers";
+  scriptFile  = "${wallpaperDst}/set-wallpapers-at-logon.sh";
 in
 {
   ############################
-  # System-wide packages
+  # Systemwide packages
   ############################
   environment.systemPackages = with pkgs; [
     swww
@@ -2958,77 +2959,51 @@ in
   ];
 
   ############################
-  # swww daemon for the user
+  # Ensure swww daemon runs
   ############################
-  systemd.user.services.swwwDaemon = {
-    description = "swww wallpaper daemon";
-    after       = [ "graphical-session.target" ];
-    wantedBy    = [ "default.target" ];
-    serviceConfig = {
-      ExecStart = "${pkgs.swww}/bin/swww daemon";
-      Restart   = "always";
-      Type      = "simple";
-    };
-  };
+  services.swww.enable = true;
 
   ############################
-  # Run the wallpaper script at login
-  ############################
-  systemd.user.services.wallpaperSyncLogin = {
-    description = "Run wallpaper script at login";
-    wantedBy    = [ "default.target" ];
-    after       = [ "swwwDaemon.service" ];
-    requires    = [ "swwwDaemon.service" ];
-    serviceConfig = {
-      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";
-    };
-  };
-
-  ############################
-  # 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;
-  };
-
-  ############################
-  # Run the script every 15 min
+  # User systemd service to sync wallpapers and run script
   ############################
   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";
-    };
+    description = "Sync Wallpapers and run set-wallpapers-at-logon.sh";
+    wants = [ "graphical-session.target" ];
+    after = [ "graphical-session.target" ];
+
+    serviceConfig.Type = "oneshot";
+    serviceConfig.ExecStart = ''
+      # Ensure destination exists
+      mkdir -p ${wallpaperDst}
+
+      # Copy wallpapers: overwrite newer files, do not delete existing files
+      rsync -au --ignore-existing ${wallpaperSrc}/ ${wallpaperDst}/
+      rsync -au ${wallpaperSrc}/ ${wallpaperDst}/
+
+      # Execute the logon wallpaper script
+      ${scriptFile}
+    '';
+    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";      # run soon after login
+    timerConfig.OnUnitActiveSec = "15min";
+    timerConfig.Persistent = true;
   };
 }
 
-
-

generated/modules/traveldroid/desktop/stylix.nix

-
+
+

generated/modules/traveldroid/desktop/stylix.nix

+
{ lib, config, pkgs, flakeRoot, stylix, ... }:
 
@@ -3120,9 +3095,9 @@ in
 
-
-

.config/stylix/stylix.conf

-
+
+

.config/stylix/stylix.conf

+

These are config files for .config/stylix

@@ -3159,9 +3134,9 @@ icons = {
-
-

.config/stylix/palette.json

-
+
+

.config/stylix/palette.json

+

These are config files for .config/stylix

@@ -3191,9 +3166,9 @@ These are config files for .config/stylix
-
-

.config/stylix/palette.html

-
+
+

.config/stylix/palette.html

+

These are config files for .config/stylix

@@ -3271,9 +3246,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

@@ -3324,9 +3299,9 @@ in
-
-

.config/waybar/config

-
+
+

.config/waybar/config

+

These are config files for waybar

@@ -3449,9 +3424,9 @@ These are config files for waybar
-
-

.config/waybar/style.css

-
+
+

.config/waybar/style.css

+

These are config files for waybar

@@ -3686,9 +3661,9 @@ window#waybar {
-
-

.config/waypaper/config.ini

-
+
+

.config/waypaper/config.ini

+

These are config files for waypaper

@@ -3725,9 +3700,9 @@ keybindings = ~/.config/waypaper/keybindings.ini
-
-

generated/modules/traveldroid/desktop/wayland.nix

-
+
+

generated/modules/traveldroid/desktop/wayland.nix

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

generated/modules/traveldroid/desktop/xdg.nix

-
+
+

generated/modules/traveldroid/desktop/xdg.nix

+

This sets the XDG implementation

@@ -3812,13 +3787,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, ... }:
 
@@ -3859,9 +3834,9 @@ in
 
-
-

generated/modules/traveldroid/system/dbus.nix

-
+
+

generated/modules/traveldroid/system/dbus.nix

+

This sets the dbus implementation

@@ -3888,9 +3863,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

@@ -3944,9 +3919,9 @@ in
-
-

generated/modules/traveldroid/system/networking.nix

-
+
+

generated/modules/traveldroid/system/networking.nix

+

This sets the networking.

@@ -4010,9 +3985,9 @@ This sets the networking.
-
-

generated/modules/traveldroid/system/nix.nix

-
+
+

generated/modules/traveldroid/system/nix.nix

+
{ lib, config, ... }:
 
@@ -4029,13 +4004,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

@@ -4086,9 +4061,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

@@ -4143,9 +4118,9 @@ in

These are all the prepared config files

-
-

.config/waybar/style.css

-
+
+

.config/waybar/style.css

+

These are config files for .config/waybar

@@ -4379,9 +4354,9 @@ window#waybar {
-
-

.config/waypaper/config.ini

-
+
+

.config/waypaper/config.ini

+

These are config files for .config/waypaper

@@ -4418,9 +4393,9 @@ keybindings = ~/.config/waypaper/keybindings.ini
-
-

.config/zed/settings.json

-
+
+

.config/zed/settings.json

+

These are config files for .config/zed

@@ -4460,7 +4435,7 @@ These are config files for .config/zed

Author: Henro Veijer

-

Created: 2026-03-29 Sun 13:06

+

Created: 2026-03-29 Sun 13:15

Validate

diff --git a/Droidnix/README.org b/Droidnix/README.org index 4708e8f90..081ba6dcc 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -2358,17 +2358,18 @@ 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, flakeRoot, ... }: +{ config, pkgs, lib, flakeRoot, ... }: 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"; + username = config.users.users."traveldroid".name or "traveldroid"; + homeDir = "/home/${username}"; + wallpaperSrc = "${flakeRoot}/assets/Wallpapers"; + wallpaperDst = "${homeDir}/Wallpapers"; + scriptFile = "${wallpaperDst}/set-wallpapers-at-logon.sh"; in { ############################ - # System-wide packages + # Systemwide packages ############################ environment.systemPackages = with pkgs; [ swww @@ -2378,68 +2379,42 @@ in ]; ############################ - # swww daemon for the user + # Ensure swww daemon runs ############################ - systemd.user.services.swwwDaemon = { - description = "swww wallpaper daemon"; - after = [ "graphical-session.target" ]; - wantedBy = [ "default.target" ]; - serviceConfig = { - ExecStart = "${pkgs.swww}/bin/swww daemon"; - Restart = "always"; - Type = "simple"; - }; - }; + services.swww.enable = true; ############################ - # Run the wallpaper script at login - ############################ - systemd.user.services.wallpaperSyncLogin = { - description = "Run wallpaper script at login"; - wantedBy = [ "default.target" ]; - after = [ "swwwDaemon.service" ]; - requires = [ "swwwDaemon.service" ]; - serviceConfig = { - 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"; - }; - }; - - ############################ - # 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; - }; - - ############################ - # Run the script every 15 min + # User systemd service to sync wallpapers and run script ############################ 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"; - }; + description = "Sync Wallpapers and run set-wallpapers-at-logon.sh"; + wants = [ "graphical-session.target" ]; + after = [ "graphical-session.target" ]; + + serviceConfig.Type = "oneshot"; + serviceConfig.ExecStart = '' + # Ensure destination exists + mkdir -p ${wallpaperDst} + + # Copy wallpapers: overwrite newer files, do not delete existing files + rsync -au --ignore-existing ${wallpaperSrc}/ ${wallpaperDst}/ + rsync -au ${wallpaperSrc}/ ${wallpaperDst}/ + + # Execute the logon wallpaper script + ${scriptFile} + ''; + 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"; # run soon after login + timerConfig.OnUnitActiveSec = "15min"; + timerConfig.Persistent = true; }; } #+END_SRC diff --git a/Droidnix/generated/modules/traveldroid/desktop/wallpaper.nix b/Droidnix/generated/modules/traveldroid/desktop/wallpaper.nix index 4401dadc3..cb0c9f51d 100644 --- a/Droidnix/generated/modules/traveldroid/desktop/wallpaper.nix +++ b/Droidnix/generated/modules/traveldroid/desktop/wallpaper.nix @@ -1,14 +1,15 @@ -{ config, pkgs, flakeRoot, ... }: +{ config, pkgs, lib, flakeRoot, ... }: 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"; + username = config.users.users."traveldroid".name or "traveldroid"; + homeDir = "/home/${username}"; + wallpaperSrc = "${flakeRoot}/assets/Wallpapers"; + wallpaperDst = "${homeDir}/Wallpapers"; + scriptFile = "${wallpaperDst}/set-wallpapers-at-logon.sh"; in { ############################ - # System-wide packages + # Systemwide packages ############################ environment.systemPackages = with pkgs; [ swww @@ -18,67 +19,41 @@ in ]; ############################ - # swww daemon for the user + # Ensure swww daemon runs ############################ - systemd.user.services.swwwDaemon = { - description = "swww wallpaper daemon"; - after = [ "graphical-session.target" ]; - wantedBy = [ "default.target" ]; - serviceConfig = { - ExecStart = "${pkgs.swww}/bin/swww daemon"; - Restart = "always"; - Type = "simple"; - }; - }; + services.swww.enable = true; ############################ - # Run the wallpaper script at login - ############################ - systemd.user.services.wallpaperSyncLogin = { - description = "Run wallpaper script at login"; - wantedBy = [ "default.target" ]; - after = [ "swwwDaemon.service" ]; - requires = [ "swwwDaemon.service" ]; - serviceConfig = { - 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"; - }; - }; - - ############################ - # 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; - }; - - ############################ - # Run the script every 15 min + # User systemd service to sync wallpapers and run script ############################ 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"; - }; + description = "Sync Wallpapers and run set-wallpapers-at-logon.sh"; + wants = [ "graphical-session.target" ]; + after = [ "graphical-session.target" ]; + + serviceConfig.Type = "oneshot"; + serviceConfig.ExecStart = '' + # Ensure destination exists + mkdir -p ${wallpaperDst} + + # Copy wallpapers: overwrite newer files, do not delete existing files + rsync -au --ignore-existing ${wallpaperSrc}/ ${wallpaperDst}/ + rsync -au ${wallpaperSrc}/ ${wallpaperDst}/ + + # Execute the logon wallpaper script + ${scriptFile} + ''; + 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"; # run soon after login + timerConfig.OnUnitActiveSec = "15min"; + timerConfig.Persistent = true; }; }