chore: Also use files in /etc/ folder

ublue-os · Aug 7, 2024 · ea26781 · ea26781
1 parent 167a12c
commit ea26781
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/system_files/deck/silverblue/usr/share/ublue-os/just/90-bazzite-de.just b/system_files/deck/silverblue/usr/share/ublue-os/just/90-bazzite-de.just
@@ -2,15 +2,15 @@
 
 # Restore Bazzite customized DE settings
 restore-gnome-de-settings:
-    dconf load / < /usr/etc/dconf/db/local.d/02-bazzite-global
-    dconf load / < /usr/etc/dconf/db/local.d/03-bazzite-dash
-    dconf load / < /usr/etc/dconf/db/local.d/05-bazzite-extensions
-    dconf load / < /usr/etc/dconf/db/local.d/06-bazzite-theme
-    dconf load / < /usr/etc/dconf/db/local.d/07-bazzite-deck
+    dconf load / < /etc/dconf/db/local.d/02-bazzite-global
+    dconf load / < /etc/dconf/db/local.d/03-bazzite-dash
+    dconf load / < /etc/dconf/db/local.d/05-bazzite-extensions
+    dconf load / < /etc/dconf/db/local.d/06-bazzite-theme
+    dconf load / < /etc/dconf/db/local.d/07-bazzite-deck
 
 # Restore Bazzite customized applications folders
 restore-gnome-folders:
-    dconf load / < /usr/etc/dconf/db/local.d/04-bazzite-folders
+    dconf load / < /etc/dconf/db/local.d/04-bazzite-folders
 
 # Change automatic power profile switching behavior
 configure-auto-power-profile ACTION="help":

diff --git a/system_files/desktop/kinoite/usr/share/ublue-os/just/90-bazzite-de.just b/system_files/desktop/kinoite/usr/share/ublue-os/just/90-bazzite-de.just
@@ -4,5 +4,5 @@
 restore-bazzite-breeze-gtk-theme:
     rm -f $HOME/.config/gtk-4.0/gtk.css
     rm -f $HOME/.config/gtk-4.0/kde_window_geometry.css
-    cp /usr/etc/skel/.config/gtk-4.0/gtk.css $HOME/.config/gtk-4.0/gtk.css
-    cp /usr/etc/skel/.config/gtk-4.0/kde_window_geometry.css $HOME/.config/gtk-4.0/kde_window_geometry.css
+    cp /etc/skel/.config/gtk-4.0/gtk.css $HOME/.config/gtk-4.0/gtk.css
+    cp /etc/skel/.config/gtk-4.0/kde_window_geometry.css $HOME/.config/gtk-4.0/kde_window_geometry.css
diff --git a/system_files/desktop/shared/usr/libexec/bazzite-flatpak-manager b/system_files/desktop/shared/usr/libexec/bazzite-flatpak-manager
@@ -23,7 +23,7 @@ if [[ -f $VER_FILE && $VER = $VER_RAN ]]; then
 fi
 
 # Ensure Flathub is enabled
-flatpak remote-add --if-not-exists --system flathub /usr/etc/flatpak/remotes.d/flathub.flatpakrepo
+flatpak remote-add --if-not-exists --system flathub /etc/flatpak/remotes.d/flathub.flatpakrepo
 flatpak remote-modify --system --enable flathub
 
 # Flatpak theming support

diff --git a/system_files/desktop/shared/usr/libexec/bazzite-user-setup b/system_files/desktop/shared/usr/libexec/bazzite-user-setup
@@ -44,14 +44,14 @@ if [[ -f $USER_SETUP_VER_FILE && -f $USER_SETUP_FEDORA_VER_FILE && -f $USER_SETU
 fi
 
 # Enable Flathub
-flatpak remote-add --if-not-exists --user flathub /usr/etc/flatpak/remotes.d/flathub.flatpakrepo
+flatpak remote-add --if-not-exists --user flathub /etc/flatpak/remotes.d/flathub.flatpakrepo
 flatpak remote-modify --user --enable flathub
 
 # Handle privileged tasks
 pkexec /usr/libexec/bazzite-privileged-user-setup "$USER"
 
 # Set up optional Gradience themes
-GRADIENCE_THEME_DIR="/usr/etc/skel/.var/app/com.github.GradienceTeam.Gradience/config/presets/user"
+GRADIENCE_THEME_DIR="/etc/skel/.var/app/com.github.GradienceTeam.Gradience/config/presets/user"
 GRADIENCE_DIR="$HOME/.var/app/com.github.GradienceTeam.Gradience/config/presets/user"
 mkdir -p "$GRADIENCE_DIR"
 if [[ ! -f "$GRADIENCE_DIR/vapor.json" ]]; then
@@ -61,7 +61,7 @@ if [[ ! -f "$GRADIENCE_DIR/vgui2.json" ]]; then
   cp "$GRADIENCE_THEME_DIR/vgui2.json" "$GRADIENCE_DIR/vgui2.json"
 fi
 
-PTYXIS_THEME_DIR="/usr/etc/skel/.local/share/org.gnome.Ptyxis/palettes"
+PTYXIS_THEME_DIR="/etc/skel/.local/share/org.gnome.Ptyxis/palettes"
 PTYXIS_DIR="$HOME/.local/share/org.gnome.Ptyxis/palettes"
 mkdir -p "$PTYXIS_DIR"
 if [[ ! -f "$PTYXIS_DIR/vapor.palette" ]]; then

diff --git a/system_files/desktop/silverblue/usr/share/ublue-os/just/90-bazzite-de.just b/system_files/desktop/silverblue/usr/share/ublue-os/just/90-bazzite-de.just
@@ -2,14 +2,14 @@
 
 # Restore Bazzite customized DE settings
 restore-gnome-de-settings:
-    dconf load / < /usr/etc/dconf/db/local.d/02-bazzite-global
-    dconf load / < /usr/etc/dconf/db/local.d/03-bazzite-dash
-    dconf load / < /usr/etc/dconf/db/local.d/05-bazzite-extensions
-    dconf load / < /usr/etc/dconf/db/local.d/06-bazzite-theme
+    dconf load / < /etc/dconf/db/local.d/02-bazzite-global
+    dconf load / < /etc/dconf/db/local.d/03-bazzite-dash
+    dconf load / < /etc/dconf/db/local.d/05-bazzite-extensions
+    dconf load / < /etc/dconf/db/local.d/06-bazzite-theme
 
 # Restore Bazzite customized applications folders
 restore-gnome-folders:
-    dconf load / < /usr/etc/dconf/db/local.d/04-bazzite-folders
+    dconf load / < /etc/dconf/db/local.d/04-bazzite-folders
 
 # Change automatic power profile switching behavior
 configure-auto-power-profile ACTION="help":