refactor: Update module files directory structure (#235)

See https://blue-build.org/blog/config-files/
zelikos · Jul 21, 2024 · 90f7223 · 90f7223
1 parent 37e5f66
commit 90f7223
Show file tree

Hide file tree

Showing 74 changed files with 9 additions and 7 deletions.
diff --git a/...a-overrides/zz0-zeliblue.gschema.override → ...a-overrides/zz0-zeliblue.gschema.override b/...a-overrides/zz0-zeliblue.gschema.override → ...a-overrides/zz0-zeliblue.gschema.override
diff --git a/config/scripts/example.sh → files/scripts/example.sh b/config/scripts/example.sh → files/scripts/example.sh
diff --git a/config/scripts/image-info.sh → files/scripts/image-info.sh b/config/scripts/image-info.sh → files/scripts/image-info.sh
diff --git a/config/scripts/steam-install.sh → files/scripts/steam-install.sh b/config/scripts/steam-install.sh → files/scripts/steam-install.sh
diff --git a/config/scripts/steamos-setup.sh → files/scripts/steamos-setup.sh b/config/scripts/steamos-setup.sh → files/scripts/steamos-setup.sh
diff --git a/.../files/deck/usr/bin/gnome-session-oneshot → ..._files/deck/usr/bin/gnome-session-oneshot b/.../files/deck/usr/bin/gnome-session-oneshot → ..._files/deck/usr/bin/gnome-session-oneshot
diff --git a/config/files/deck/usr/bin/return-to-gamemode → ...tem_files/deck/usr/bin/return-to-gamemode b/config/files/deck/usr/bin/return-to-gamemode → ...tem_files/deck/usr/bin/return-to-gamemode
diff --git a/config/files/deck/usr/bin/steamos-logger → .../system_files/deck/usr/bin/steamos-logger b/config/files/deck/usr/bin/steamos-logger → .../system_files/deck/usr/bin/steamos-logger
diff --git a/...files/deck/usr/bin/steamos-session-select → ...files/deck/usr/bin/steamos-session-select b/...files/deck/usr/bin/steamos-session-select → ...files/deck/usr/bin/steamos-session-select
diff --git a/config/files/deck/usr/bin/steamos-update → .../system_files/deck/usr/bin/steamos-update b/config/files/deck/usr/bin/steamos-update → .../system_files/deck/usr/bin/steamos-update
diff --git a/config/files/deck/usr/bin/zelideck-autologin → ...tem_files/deck/usr/bin/zelideck-autologin b/config/files/deck/usr/bin/zelideck-autologin → ...tem_files/deck/usr/bin/zelideck-autologin
diff --git a/...les/deck/usr/bin/zelideck-gamescope-setup → ...les/deck/usr/bin/zelideck-gamescope-setup b/...les/deck/usr/bin/zelideck-gamescope-setup → ...les/deck/usr/bin/zelideck-gamescope-setup
diff --git a/config/files/deck/usr/bin/zelideck-steam → .../system_files/deck/usr/bin/zelideck-steam b/config/files/deck/usr/bin/zelideck-steam → .../system_files/deck/usr/bin/zelideck-steam
diff --git a/...es/deck/usr/bin/zelideck-toggle-autologin → ...es/deck/usr/bin/zelideck-toggle-autologin b/...es/deck/usr/bin/zelideck-toggle-autologin → ...es/deck/usr/bin/zelideck-toggle-autologin
diff --git a/...polkit-1/rules.d/return-to-gamemode.rules → ...polkit-1/rules.d/return-to-gamemode.rules b/...polkit-1/rules.d/return-to-gamemode.rules → ...polkit-1/rules.d/return-to-gamemode.rules
diff --git a/...polkit-1/rules.d/ublue-update-force.rules → ...polkit-1/rules.d/ublue-update-force.rules b/...polkit-1/rules.d/ublue-update-force.rules → ...polkit-1/rules.d/ublue-update-force.rules
diff --git a/...polkit-1/rules.d/zelideck-autologin.rules → ...polkit-1/rules.d/zelideck-autologin.rules b/...polkit-1/rules.d/zelideck-autologin.rules → ...polkit-1/rules.d/zelideck-autologin.rules
diff --git a/...1/rules.d/zelideck-toggle-autologin.rules → ...1/rules.d/zelideck-toggle-autologin.rules b/...1/rules.d/zelideck-toggle-autologin.rules → ...1/rules.d/zelideck-toggle-autologin.rules
diff --git a/...les/deck/usr/etc/sddm.conf.d/steamos.conf → ...les/deck/usr/etc/sddm.conf.d/steamos.conf b/...les/deck/usr/etc/sddm.conf.d/steamos.conf → ...les/deck/usr/etc/sddm.conf.d/steamos.conf
diff --git a/...ournald.conf.d/00-journal-persistent.conf → ...ournald.conf.d/00-journal-persistent.conf b/...ournald.conf.d/00-journal-persistent.conf → ...ournald.conf.d/00-journal-persistent.conf
diff --git a/...temd/journald.conf.d/00-journal-size.conf → ...temd/journald.conf.d/00-journal-size.conf b/...temd/journald.conf.d/00-journal-size.conf → ...temd/journald.conf.d/00-journal-size.conf
diff --git a/...temd/logind.conf.d/killuserprocesses.conf → ...temd/logind.conf.d/killuserprocesses.conf b/...temd/logind.conf.d/killuserprocesses.conf → ...temd/logind.conf.d/killuserprocesses.conf
diff --git a/...systemd/system/return-to-gamemode.service → ...systemd/system/return-to-gamemode.service b/...systemd/system/return-to-gamemode.service → ...systemd/system/return-to-gamemode.service
diff --git a/...systemd/system/ublue-update-force.service → ...systemd/system/ublue-update-force.service b/...systemd/system/ublue-update-force.service → ...systemd/system/ublue-update-force.service
diff --git a/...systemd/system/zelideck-autologin.service → ...systemd/system/zelideck-autologin.service b/...systemd/system/zelideck-autologin.service → ...systemd/system/zelideck-autologin.service
diff --git a/.../system/zelideck-toggle-autologin.service → .../system/zelideck-toggle-autologin.service b/.../system/zelideck-toggle-autologin.service → .../system/zelideck-toggle-autologin.service
diff --git a/...emd/user/zelideck-gamescope-setup.service → ...emd/user/zelideck-gamescope-setup.service b/...emd/user/zelideck-gamescope-setup.service → ...emd/user/zelideck-gamescope-setup.service
diff --git a/...ions/zeliblue-deck.session-return.desktop → ...ions/zeliblue-deck.session-return.desktop b/...ions/zeliblue-deck.session-return.desktop → ...ions/zeliblue-deck.session-return.desktop
diff --git a/...ns/zelideck-deck.toggle-autologin.desktop → ...ns/zelideck-deck.toggle-autologin.desktop b/...ns/zelideck-deck.toggle-autologin.desktop → ...ns/zelideck-deck.toggle-autologin.desktop
diff --git a/...it-1/actions/org.bazzite.dmidecode.policy → ...it-1/actions/org.bazzite.dmidecode.policy b/...it-1/actions/org.bazzite.dmidecode.policy → ...it-1/actions/org.bazzite.dmidecode.policy
diff --git a/...olkit-1/actions/org.chimeraos.host.policy → ...olkit-1/actions/org.chimeraos.host.policy b/...olkit-1/actions/org.chimeraos.host.policy → ...olkit-1/actions/org.chimeraos.host.policy
diff --git a/...1/actions/org.chimeraos.priv.write.policy → ...1/actions/org.chimeraos.priv.write.policy b/...1/actions/org.chimeraos.priv.write.policy → ...1/actions/org.chimeraos.priv.write.policy
diff --git a/...tions/org.chimeraos.session.select.policy → ...tions/org.chimeraos.session.select.policy b/...tions/org.chimeraos.session.select.policy → ...tions/org.chimeraos.session.select.policy
diff --git a/...e/polkit-1/rules.d/40-system-tweaks.rules → ...e/polkit-1/rules.d/40-system-tweaks.rules b/...e/polkit-1/rules.d/40-system-tweaks.rules → ...e/polkit-1/rules.d/40-system-tweaks.rules
diff --git a/...share/polkit-1/rules.d/60-dmidecode.rules → ...share/polkit-1/rules.d/60-dmidecode.rules b/...share/polkit-1/rules.d/60-dmidecode.rules → ...share/polkit-1/rules.d/60-dmidecode.rules
diff --git a/...nd-sessions/gnome-wayland-oneshot.desktop → ...nd-sessions/gnome-wayland-oneshot.desktop b/...nd-sessions/gnome-wayland-oneshot.desktop → ...nd-sessions/gnome-wayland-oneshot.desktop
diff --git a/.../dconf/db/local.d/01-zeliblue-keybindings → .../dconf/db/local.d/01-zeliblue-keybindings b/.../dconf/db/local.d/01-zeliblue-keybindings → .../dconf/db/local.d/01-zeliblue-keybindings
diff --git a/...ig/files/gnome/usr/etc/dconf/profile/user → ...em_files/gnome/usr/etc/dconf/profile/user b/...ig/files/gnome/usr/etc/dconf/profile/user → ...em_files/gnome/usr/etc/dconf/profile/user
diff --git a/...e.Ptyxis/config/glib-2.0/settings/keyfile → ...e.Ptyxis/config/glib-2.0/settings/keyfile b/...e.Ptyxis/config/glib-2.0/settings/keyfile → ...e.Ptyxis/config/glib-2.0/settings/keyfile
diff --git a/...kel/.local/share/konsole/Zeliblue.profile → ...kel/.local/share/konsole/Zeliblue.profile b/...kel/.local/share/konsole/Zeliblue.profile → ...kel/.local/share/konsole/Zeliblue.profile
diff --git a/config/files/plasma/usr/etc/xdg/dolphinrc → ...system_files/plasma/usr/etc/xdg/dolphinrc b/config/files/plasma/usr/etc/xdg/dolphinrc → ...system_files/plasma/usr/etc/xdg/dolphinrc
diff --git a/config/files/plasma/usr/etc/xdg/kdeglobals → ...ystem_files/plasma/usr/etc/xdg/kdeglobals b/config/files/plasma/usr/etc/xdg/kdeglobals → ...ystem_files/plasma/usr/etc/xdg/kdeglobals
diff --git a/config/files/plasma/usr/etc/xdg/konsolerc → ...system_files/plasma/usr/etc/xdg/konsolerc b/config/files/plasma/usr/etc/xdg/konsolerc → ...system_files/plasma/usr/etc/xdg/konsolerc
diff --git a/config/files/plasma/usr/etc/xdg/kwinrc → files/system_files/plasma/usr/etc/xdg/kwinrc b/config/files/plasma/usr/etc/xdg/kwinrc → files/system_files/plasma/usr/etc/xdg/kwinrc
diff --git a/...g/plasma-org.kde.plasma.desktop-appletsrc → ...g/plasma-org.kde.plasma.desktop-appletsrc b/...g/plasma-org.kde.plasma.desktop-appletsrc → ...g/plasma-org.kde.plasma.desktop-appletsrc
diff --git a/...ig/files/plasma/usr/etc/xdg/plasmashellrc → ...em_files/plasma/usr/etc/xdg/plasmashellrc b/...ig/files/plasma/usr/etc/xdg/plasmashellrc → ...em_files/plasma/usr/etc/xdg/plasmashellrc
diff --git a/...g/files/shared/etc/yum.repos.d/charm.repo → ...m_files/shared/etc/yum.repos.d/charm.repo b/...g/files/shared/etc/yum.repos.d/charm.repo → ...m_files/shared/etc/yum.repos.d/charm.repo
diff --git a/...s/shared/usr/etc/distrobox/distrobox.conf → ...s/shared/usr/etc/distrobox/distrobox.conf b/...s/shared/usr/etc/distrobox/distrobox.conf → ...s/shared/usr/etc/distrobox/distrobox.conf
diff --git a/config/files/shared/usr/etc/rpm-ostreed.conf → ...tem_files/shared/usr/etc/rpm-ostreed.conf b/config/files/shared/usr/etc/rpm-ostreed.conf → ...tem_files/shared/usr/etc/rpm-ostreed.conf
diff --git a/...r/etc/skel/.local/share/zeliblue/Brewfile → ...r/etc/skel/.local/share/zeliblue/Brewfile b/...r/etc/skel/.local/share/zeliblue/Brewfile → ...r/etc/skel/.local/share/zeliblue/Brewfile
diff --git a/...usr/etc/skel/Templates/Untitled Script.sh → ...usr/etc/skel/Templates/Untitled Script.sh b/...usr/etc/skel/Templates/Untitled Script.sh → ...usr/etc/skel/Templates/Untitled Script.sh
diff --git a/.../usr/etc/skel/Templates/Untitled Text.txt → .../usr/etc/skel/Templates/Untitled Text.txt b/.../usr/etc/skel/Templates/Untitled Text.txt → .../usr/etc/skel/Templates/Untitled Text.txt
diff --git a/...files/shared/usr/etc/sudoers.d/pwfeedback → ...files/shared/usr/etc/sudoers.d/pwfeedback b/...files/shared/usr/etc/sudoers.d/pwfeedback → ...files/shared/usr/etc/sudoers.d/pwfeedback
diff --git a/...red/usr/etc/system76-scheduler/config.kdl → ...red/usr/etc/system76-scheduler/config.kdl b/...red/usr/etc/system76-scheduler/config.kdl → ...red/usr/etc/system76-scheduler/config.kdl
diff --git a/...es/shared/usr/lib/sysctl.d/20-gaming.conf → ...es/shared/usr/lib/sysctl.d/20-gaming.conf b/...es/shared/usr/lib/sysctl.d/20-gaming.conf → ...es/shared/usr/lib/sysctl.d/20-gaming.conf
diff --git a/...s/shared/usr/lib/sysctl.d/80-inotify.conf → ...s/shared/usr/lib/sysctl.d/80-inotify.conf b/...s/shared/usr/lib/sysctl.d/80-inotify.conf → ...s/shared/usr/lib/sysctl.d/80-inotify.conf
diff --git a/config/files/shared/usr/libexec/ublue-motd → ...ystem_files/shared/usr/libexec/ublue-motd b/config/files/shared/usr/libexec/ublue-motd → ...ystem_files/shared/usr/libexec/ublue-motd
diff --git a/.../share/applications/system-update.desktop → .../share/applications/system-update.desktop b/.../share/applications/system-update.desktop → .../share/applications/system-update.desktop
diff --git a/...d/usr/share/fish/vendor_conf.d/bling.fish → ...d/usr/share/fish/vendor_conf.d/bling.fish b/...d/usr/share/fish/vendor_conf.d/bling.fish → ...d/usr/share/fish/vendor_conf.d/bling.fish
diff --git a/...are/fish/vendor_conf.d/zeliblue-just.fish → ...are/fish/vendor_conf.d/zeliblue-just.fish b/...are/fish/vendor_conf.d/zeliblue-just.fish → ...are/fish/vendor_conf.d/zeliblue-just.fish
diff --git a/...ish/vendor_functions.d/fish_greeting.fish → ...ish/vendor_functions.d/fish_greeting.fish b/...ish/vendor_functions.d/fish_greeting.fish → ...ish/vendor_functions.d/fish_greeting.fish
diff --git a/...ed/usr/share/ublue-os/firstboot/yafti.yml → ...ed/usr/share/ublue-os/firstboot/yafti.yml b/...ed/usr/share/ublue-os/firstboot/yafti.yml → ...ed/usr/share/ublue-os/firstboot/yafti.yml
diff --git a/...ed/usr/share/ublue-os/just/10-update.just → ...ed/usr/share/ublue-os/just/10-update.just b/...ed/usr/share/ublue-os/just/10-update.just → ...ed/usr/share/ublue-os/just/10-update.just
diff --git a/...ed/usr/share/ublue-os/just/60-custom.just → ...ed/usr/share/ublue-os/just/60-custom.just b/...ed/usr/share/ublue-os/just/60-custom.just → ...ed/usr/share/ublue-os/just/60-custom.just
diff --git a/...r/share/ublue-update/topgrade-system.toml → ...r/share/ublue-update/topgrade-system.toml b/...r/share/ublue-update/topgrade-system.toml → ...r/share/ublue-update/topgrade-system.toml
diff --git a/...usr/share/ublue-update/topgrade-user.toml → ...usr/share/ublue-update/topgrade-user.toml b/...usr/share/ublue-update/topgrade-user.toml → ...usr/share/ublue-update/topgrade-user.toml
diff --git a/...d/usr/share/zeliblue/motd/tips/10-tips.md → ...d/usr/share/zeliblue/motd/tips/10-tips.md b/...d/usr/share/zeliblue/motd/tips/10-tips.md → ...d/usr/share/zeliblue/motd/tips/10-tips.md
diff --git a/...hared/usr/share/zeliblue/motd/zeliblue.md → ...hared/usr/share/zeliblue/motd/zeliblue.md b/...hared/usr/share/zeliblue/motd/zeliblue.md → ...hared/usr/share/zeliblue/motd/zeliblue.md
diff --git a/.../zeliblue/quadlets/zeliblue-cli.container → .../zeliblue/quadlets/zeliblue-cli.container b/.../zeliblue/quadlets/zeliblue-cli.container → .../zeliblue/quadlets/zeliblue-cli.container
diff --git a/...s/shared/usr/share/zeliblue/topgrade.toml → ...s/shared/usr/share/zeliblue/topgrade.toml b/...s/shared/usr/share/zeliblue/topgrade.toml → ...s/shared/usr/share/zeliblue/topgrade.toml
diff --git a/recipes/common/common-files.yml b/recipes/common/common-files.yml
@@ -1,4 +1,4 @@
 type: files
 files:
-  - shared/usr: /usr
-  - shared/etc: /etc
+  - source: system_files/shared
+    destination: /
diff --git a/recipes/gnome/gnome-files.yml b/recipes/gnome/gnome-files.yml
@@ -1,3 +1,4 @@
 type: files
 files:
-  - gnome/usr: /usr
+  - source: system_files/gnome
+    destination: /
diff --git a/recipes/gnome/zeliblue-deck.yml b/recipes/gnome/zeliblue-deck.yml
@@ -25,9 +25,9 @@ modules:
   - from-file: gnome/gnome-flatpaks.yml
   - from-file: gnome/gnome-gschemas.yml
 
-  - type: files
-    files:
-      - deck/usr: /usr
+  - files:
+    - source: system_files/deck
+      destination: /
 
   - type: rpm-ostree
     repos:

diff --git a/recipes/plasma/plasma-files.yml b/recipes/plasma/plasma-files.yml
@@ -1,3 +1,4 @@
 type: files
 files:
-  - plasma/usr: /usr
+  - source: system_files/plasma
+    destination: /