Regenerated

Droidnix/README.org

@@ -2358,61 +2358,63 @@ 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, lib, flakeRoot, ... }:
+{ lib, config, pkgs, flakeRoot, ... }:
 
 let
-  username     = config.users.users.defaultUser or "henrov";
+  username     = config.defaultUser or "henrov";
   homeDir      = "/home/${username}";
   wallpaperSrc = "${flakeRoot}/assets/traveldroid/Wallpapers";
   wallpaperDst = "${homeDir}/Wallpapers";
-  scriptFile   = "${homeDir}/copy-wallpapers.sh";
 in
 {
-  ############################
+  # Make bash available
-  # Ensure bash exists
-  ############################
   environment.systemPackages = [ pkgs.bash ];
 
-  ############################
+  # Create the copy script using Home Manager, following Waybar style
-  # Create the script in the user's home
-  ############################
   home-manager.users = {
     ${username} = {
-      home.file."copy-wallpapers.sh".text = ''
+      home.file = {
-        #!/usr/bin/env bash
+        "copy-wallpapers.sh" = {
-        set -e
+          text = ''
-        echo "Copying wallpapers from ${wallpaperSrc} to ${wallpaperDst} ..."
+            #!/usr/bin/env bash
+            set -e
+            echo "Copying wallpapers from ${wallpaperSrc} to ${wallpaperDst} ..."
 
-        if [ ! -d "${wallpaperSrc}" ]; then
+            if [ ! -d "${wallpaperSrc}" ]; then
-          echo "ERROR: ${wallpaperSrc} does not exist"
+              echo "ERROR: ${wallpaperSrc} does not exist"
-          exit 1
+              exit 1
-        fi
+            fi
 
-        mkdir -p "${wallpaperDst}"
+            mkdir -p "${wallpaperDst}"
 
-        # Copy everything
+            # Simple copy, overwrite everything
-        cp -r "${wallpaperSrc}/." "${wallpaperDst}/"
+            cp -r "${wallpaperSrc}/." "${wallpaperDst}/"
 
-        # Fix permissions
+            # Fix permissions
-        chmod -R u+rwx "${wallpaperDst}"
+            chmod -R u+rwx "${wallpaperDst}"
 
-        echo "Done copying wallpapers."
+            echo "Done copying wallpapers."
-      '';
+          '';
-      home.file."copy-wallpapers.sh".executable = true;
+          executable = true;
+          force = true;
+        };
+      };
     };
   };
 
-  ############################
+  # User service to run the script
-  # User systemd service that runs the script
-  ############################
   systemd.user.services.copyWallpapers = {
     description = "Copy wallpapers from repo to ~/Wallpapers";
-    wants       = [ "graphical-session.target" ];
     after       = [ "graphical-session.target" ];
+    wants       = [ "graphical-session.target" ];
 
-    serviceConfig.Type      = "oneshot";
+    serviceConfig = {
-    serviceConfig.ExecStart = scriptFile;
+      Type      = "oneshot";
-    serviceConfig.Restart   = "no";
+      ExecStart = "${homeDir}/copy-wallpapers.sh";
+      Restart   = "no";
+    };
+
+    wantedBy = [ "default.target" ];
   };
 }
 #+END_SRC

Droidnix/generated/modules/traveldroid/desktop/wallpaper.nix

@@ -1,57 +1,59 @@
-{ config, pkgs, lib, flakeRoot, ... }:
+{ lib, config, pkgs, flakeRoot, ... }:
 
 let
-  username     = config.users.users.defaultUser or "henrov";
+  username     = config.defaultUser or "henrov";
   homeDir      = "/home/${username}";
   wallpaperSrc = "${flakeRoot}/assets/traveldroid/Wallpapers";
   wallpaperDst = "${homeDir}/Wallpapers";
-  scriptFile   = "${homeDir}/copy-wallpapers.sh";
 in
 {
-  ############################
+  # Make bash available
-  # Ensure bash exists
-  ############################
   environment.systemPackages = [ pkgs.bash ];
 
-  ############################
+  # Create the copy script using Home Manager, following Waybar style
-  # Create the script in the user's home
-  ############################
   home-manager.users = {
     ${username} = {
-      home.file."copy-wallpapers.sh".text = ''
+      home.file = {
-        #!/usr/bin/env bash
+        "copy-wallpapers.sh" = {
-        set -e
+          text = ''
-        echo "Copying wallpapers from ${wallpaperSrc} to ${wallpaperDst} ..."
+            #!/usr/bin/env bash
+            set -e
+            echo "Copying wallpapers from ${wallpaperSrc} to ${wallpaperDst} ..."
 
-        if [ ! -d "${wallpaperSrc}" ]; then
+            if [ ! -d "${wallpaperSrc}" ]; then
-          echo "ERROR: ${wallpaperSrc} does not exist"
+              echo "ERROR: ${wallpaperSrc} does not exist"
-          exit 1
+              exit 1
-        fi
+            fi
 
-        mkdir -p "${wallpaperDst}"
+            mkdir -p "${wallpaperDst}"
 
-        # Copy everything
+            # Simple copy, overwrite everything
-        cp -r "${wallpaperSrc}/." "${wallpaperDst}/"
+            cp -r "${wallpaperSrc}/." "${wallpaperDst}/"
 
-        # Fix permissions
+            # Fix permissions
-        chmod -R u+rwx "${wallpaperDst}"
+            chmod -R u+rwx "${wallpaperDst}"
 
-        echo "Done copying wallpapers."
+            echo "Done copying wallpapers."
-      '';
+          '';
-      home.file."copy-wallpapers.sh".executable = true;
+          executable = true;
+          force = true;
+        };
+      };
     };
   };
 
-  ############################
+  # User service to run the script
-  # User systemd service that runs the script
-  ############################
   systemd.user.services.copyWallpapers = {
     description = "Copy wallpapers from repo to ~/Wallpapers";
-    wants       = [ "graphical-session.target" ];
     after       = [ "graphical-session.target" ];
+    wants       = [ "graphical-session.target" ];
 
-    serviceConfig.Type      = "oneshot";
+    serviceConfig = {
-    serviceConfig.ExecStart = scriptFile;
+      Type      = "oneshot";
-    serviceConfig.Restart   = "no";
+      ExecStart = "${homeDir}/copy-wallpapers.sh";
+      Restart   = "no";
+    };
+
+    wantedBy = [ "default.target" ];
   };
 }