tonarchy

Diff

diff --git a/.gitignore b/.gitignore
index 7290fe8..da45498 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ result
 notes/
 
 out/
+iso/airootfs/usr/
diff --git a/assets/firefox/alacritty/alacritty.toml b/assets/alacritty/alacritty.toml
similarity index 100%
rename from assets/firefox/alacritty/alacritty.toml
rename to assets/alacritty/alacritty.toml
diff --git a/assets/firefox/fastfetch/config.jsonc b/assets/fastfetch/config.jsonc
similarity index 100%
rename from assets/firefox/fastfetch/config.jsonc
rename to assets/fastfetch/config.jsonc
diff --git a/assets/firefox/fastfetch/logo.txt b/assets/fastfetch/logo.txt
similarity index 100%
rename from assets/firefox/fastfetch/logo.txt
rename to assets/fastfetch/logo.txt
diff --git a/assets/firefox/favicon.png b/assets/favicon.png
similarity index 100%
rename from assets/firefox/favicon.png
rename to assets/favicon.png
diff --git a/assets/firefox/firefox-policies/policies.json b/assets/firefox-policies/policies.json
similarity index 100%
rename from assets/firefox/firefox-policies/policies.json
rename to assets/firefox-policies/policies.json
diff --git a/assets/firefox/firefox/default-release/addonStartup.json.lz4 b/assets/firefox/default-release/addonStartup.json.lz4
similarity index 100%
rename from assets/firefox/firefox/default-release/addonStartup.json.lz4
rename to assets/firefox/default-release/addonStartup.json.lz4
diff --git a/assets/firefox/firefox/default-release/extension-settings.json b/assets/firefox/default-release/extension-settings.json
similarity index 100%
rename from assets/firefox/firefox/default-release/extension-settings.json
rename to assets/firefox/default-release/extension-settings.json
diff --git a/assets/firefox/firefox/default-release/extensions.json b/assets/firefox/default-release/extensions.json
similarity index 100%
rename from assets/firefox/firefox/default-release/extensions.json
rename to assets/firefox/default-release/extensions.json
diff --git a/assets/firefox/firefox/default-release/extensions/addon@darkreader.org.xpi b/assets/firefox/default-release/extensions/addon@darkreader.org.xpi
similarity index 100%
rename from assets/firefox/firefox/default-release/extensions/addon@darkreader.org.xpi
rename to assets/firefox/default-release/extensions/addon@darkreader.org.xpi
diff --git a/assets/firefox/firefox/default-release/extensions/uBlock0@raymondhill.net.xpi b/assets/firefox/default-release/extensions/uBlock0@raymondhill.net.xpi
similarity index 100%
rename from assets/firefox/firefox/default-release/extensions/uBlock0@raymondhill.net.xpi
rename to assets/firefox/default-release/extensions/uBlock0@raymondhill.net.xpi
diff --git a/assets/firefox/firefox/default-release/extensions/{4520dc08-80f4-4b2e-982a-c17af42e5e4d}.xpi b/assets/firefox/default-release/extensions/{4520dc08-80f4-4b2e-982a-c17af42e5e4d}.xpi
similarity index 100%
rename from assets/firefox/firefox/default-release/extensions/{4520dc08-80f4-4b2e-982a-c17af42e5e4d}.xpi
rename to assets/firefox/default-release/extensions/{4520dc08-80f4-4b2e-982a-c17af42e5e4d}.xpi
diff --git a/assets/firefox/firefox/default-release/user.js b/assets/firefox/default-release/user.js
similarity index 100%
rename from assets/firefox/firefox/default-release/user.js
rename to assets/firefox/default-release/user.js
diff --git a/assets/firefox/firefox/profiles.ini b/assets/firefox/profiles.ini
similarity index 100%
rename from assets/firefox/firefox/profiles.ini
rename to assets/firefox/profiles.ini
diff --git a/assets/firefox/rofi/config.rasi b/assets/rofi/config.rasi
similarity index 100%
rename from assets/firefox/rofi/config.rasi
rename to assets/rofi/config.rasi
diff --git a/assets/firefox/rofi/tokyonight.rasi b/assets/rofi/tokyonight.rasi
similarity index 100%
rename from assets/firefox/rofi/tokyonight.rasi
rename to assets/rofi/tokyonight.rasi
diff --git a/assets/firefox/xfce4/desktop/accels.scm b/assets/xfce4/desktop/accels.scm
similarity index 100%
rename from assets/firefox/xfce4/desktop/accels.scm
rename to assets/xfce4/desktop/accels.scm
diff --git a/assets/firefox/xfce4/desktop/icons.screen0.yaml b/assets/xfce4/desktop/icons.screen0.yaml
similarity index 100%
rename from assets/firefox/xfce4/desktop/icons.screen0.yaml
rename to assets/xfce4/desktop/icons.screen0.yaml
diff --git a/assets/firefox/xfce4/xfce4-screenshooter b/assets/xfce4/xfce4-screenshooter
similarity index 100%
rename from assets/firefox/xfce4/xfce4-screenshooter
rename to assets/xfce4/xfce4-screenshooter
diff --git a/assets/firefox/xfce4/xfconf/xfce-perchannel-xml/displays.xml b/assets/xfce4/xfconf/xfce-perchannel-xml/displays.xml
similarity index 100%
rename from assets/firefox/xfce4/xfconf/xfce-perchannel-xml/displays.xml
rename to assets/xfce4/xfconf/xfce-perchannel-xml/displays.xml
diff --git a/assets/firefox/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml b/assets/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml
similarity index 100%
rename from assets/firefox/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml
rename to assets/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml
diff --git a/assets/firefox/xfce4/xfconf/xfce-perchannel-xml/thunar.xml b/assets/xfce4/xfconf/xfce-perchannel-xml/thunar.xml
similarity index 100%
rename from assets/firefox/xfce4/xfconf/xfce-perchannel-xml/thunar.xml
rename to assets/xfce4/xfconf/xfce-perchannel-xml/thunar.xml
diff --git a/assets/firefox/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml b/assets/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml
similarity index 100%
rename from assets/firefox/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml
rename to assets/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml
diff --git a/assets/firefox/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/assets/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
similarity index 100%
rename from assets/firefox/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
rename to assets/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
diff --git a/assets/firefox/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml b/assets/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
similarity index 100%
rename from assets/firefox/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
rename to assets/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
diff --git a/assets/firefox/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml b/assets/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml
similarity index 100%
rename from assets/firefox/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml
rename to assets/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml
diff --git a/assets/firefox/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/assets/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
similarity index 100%
rename from assets/firefox/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
rename to assets/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
diff --git a/assets/firefox/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml b/assets/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml
similarity index 100%
rename from assets/firefox/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml
rename to assets/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml
diff --git a/assets/firefox/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-editor.xml b/assets/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-editor.xml
similarity index 100%
rename from assets/firefox/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-editor.xml
rename to assets/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-editor.xml
diff --git a/assets/firefox/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml b/assets/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml
similarity index 100%
rename from assets/firefox/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml
rename to assets/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml
diff --git a/assets/firefox/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml b/assets/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
similarity index 100%
rename from assets/firefox/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
rename to assets/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
diff --git a/assets/firefox/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/assets/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
similarity index 100%
rename from assets/firefox/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
rename to assets/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
diff --git a/src/tonarchy-mkiso.c b/src/tonarchy-mkiso.c
index 1cf0b14..ff8e466 100644
--- a/src/tonarchy-mkiso.c
+++ b/src/tonarchy-mkiso.c
@@ -172,18 +172,19 @@ int prepare_airootfs(const char *iso_profile, const char *tonarchy_src) {
         return 0;
     }
 
-    snprintf(src_path, sizeof(src_path), "%s/assets/firefox", tonarchy_src);
+    snprintf(src_path, sizeof(src_path), "%s/assets", tonarchy_src);
     snprintf(dest_path, sizeof(dest_path), "%s/airootfs/usr/share/tonarchy", iso_profile);
-    snprintf(cmd, sizeof(cmd), "cp -r '%s' '%s'", src_path, dest_path);
+    snprintf(cmd, sizeof(cmd), "cp -r '%s'/* '%s'", src_path, dest_path);
     if (!run_command(cmd)) {
         LOG_ERROR("Failed to copy tonarchy config files");
         return 0;
     }
 
-    snprintf(src_path, sizeof(src_path), "%s/assets/wallpapers", tonarchy_src);
     snprintf(dest_path, sizeof(dest_path), "%s/airootfs/usr/share/wallpapers", iso_profile);
-    snprintf(cmd, sizeof(cmd), "cp -r '%s' '%s' 2>/dev/null || true", src_path, dest_path);
-    run_command(cmd);
+    snprintf(cmd, sizeof(cmd), "cp -r '%s/wallpapers' '%s'", src_path, dest_path);
+    if (!run_command(cmd)) {
+        LOG_WARN("Failed to copy wallpapers");
+    }
 
     LOG_INFO("Setting proper ownership for airootfs...");
     snprintf(cmd, sizeof(cmd), "sudo chown -R root:root '%s/airootfs/usr'", iso_profile);