diff --git a/bin/omarchy-games-retro-install b/bin/omarchy-games-retro-install index 1465172d..76901916 100755 --- a/bin/omarchy-games-retro-install +++ b/bin/omarchy-games-retro-install @@ -55,7 +55,7 @@ icon_dir="$desktop_dir/icons" icon_path="$icon_dir/Retro Gaming.png" mkdir -p "$desktop_dir" "$icon_dir" -[[ -f $icon_path ]] || cp "$HOME/.local/share/omarchy/applications/icons/Retro Gaming.png" "$icon_path" +[[ -f $icon_path ]] || cp "$OMARCHY_PATH/applications/icons/Retro Gaming.png" "$icon_path" cat >"$desktop_file" </dev/null || true update-desktop-database "$HOME/.local/share/applications" 2>/dev/null || true diff --git a/bin/omarchy-plymouth-preview b/bin/omarchy-plymouth-preview index 981d07d6..1e36d5d9 100755 --- a/bin/omarchy-plymouth-preview +++ b/bin/omarchy-plymouth-preview @@ -35,7 +35,7 @@ fi staging_dir=$(mktemp -d) trap 'rm -rf "$staging_dir"' EXIT -find ~/.local/share/omarchy/default/plymouth -maxdepth 1 -type f -exec cp -t "$staging_dir/" {} + +find $OMARCHY_PATH/default/plymouth -maxdepth 1 -type f -exec cp -t "$staging_dir/" {} + cp "$logo_path" "$staging_dir/logo.png" for asset in bullet.png entry.png lock.png; do diff --git a/bin/omarchy-plymouth-reset b/bin/omarchy-plymouth-reset index 584c8417..551df310 100755 --- a/bin/omarchy-plymouth-reset +++ b/bin/omarchy-plymouth-reset @@ -5,7 +5,7 @@ theme_dir="/usr/share/plymouth/themes/omarchy" -sudo find ~/.local/share/omarchy/default/plymouth -maxdepth 1 -type f -exec cp -t "$theme_dir/" {} + +sudo find $OMARCHY_PATH/default/plymouth -maxdepth 1 -type f -exec cp -t "$theme_dir/" {} + sudo plymouth-set-default-theme omarchy if omarchy-cmd-present limine-mkinitcpio; then diff --git a/bin/omarchy-plymouth-set b/bin/omarchy-plymouth-set index 6420266c..4917c151 100755 --- a/bin/omarchy-plymouth-set +++ b/bin/omarchy-plymouth-set @@ -42,7 +42,7 @@ theme_dir="/usr/share/plymouth/themes/omarchy" staging_dir=$(mktemp -d) trap 'rm -rf "$staging_dir"' EXIT -find ~/.local/share/omarchy/default/plymouth -maxdepth 1 -type f -exec cp -t "$staging_dir/" {} + +find $OMARCHY_PATH/default/plymouth -maxdepth 1 -type f -exec cp -t "$staging_dir/" {} + cp "$logo_path" "$staging_dir/logo.png" sed -i \ @@ -65,7 +65,7 @@ fi # Sync the SDDM login screen with the same colors and logo. sddm_dir="/usr/share/sddm/themes/omarchy" -sddm_template="$HOME/.local/share/omarchy/default/sddm/omarchy/Main.qml" +sddm_template="$OMARCHY_PATH/default/sddm/omarchy/Main.qml" sed \ -e "s/#1a1b26/#$bg_hex/g" \ diff --git a/bin/omarchy-refresh-limine b/bin/omarchy-refresh-limine index b2b735cc..c8234278 100755 --- a/bin/omarchy-refresh-limine +++ b/bin/omarchy-refresh-limine @@ -11,7 +11,7 @@ echo "Resetting limine config" sudo mv /boot/limine.conf /boot/limine.conf.bak -sudo cp ~/.local/share/omarchy/default/limine/limine.conf /boot/limine.conf +sudo cp $OMARCHY_PATH/default/limine/limine.conf /boot/limine.conf sudo limine-update sudo limine-snapper-sync diff --git a/bin/omarchy-refresh-plymouth b/bin/omarchy-refresh-plymouth index 5a9671d7..07feaf78 100755 --- a/bin/omarchy-refresh-plymouth +++ b/bin/omarchy-refresh-plymouth @@ -3,7 +3,7 @@ # omarchy:summary=Overwrite the user config for the Plymouth drive decryption and boot sequence with the Omarchy default and rebuild it. # omarchy:requires-sudo=true -sudo cp -r ~/.local/share/omarchy/default/plymouth/* /usr/share/plymouth/themes/omarchy/ +sudo cp -r $OMARCHY_PATH/default/plymouth/* /usr/share/plymouth/themes/omarchy/ sudo plymouth-set-default-theme omarchy if command -v limine-mkinitcpio &>/dev/null; then diff --git a/bin/omarchy-reinstall-configs b/bin/omarchy-reinstall-configs index 8b073cf8..a269f02a 100755 --- a/bin/omarchy-reinstall-configs +++ b/bin/omarchy-reinstall-configs @@ -13,8 +13,8 @@ if (( EUID == 0 )); then fi echo "Resetting all Omarchy configs" -cp -R ~/.local/share/omarchy/config/* ~/.config/ -cp ~/.local/share/omarchy/default/bashrc ~/.bashrc +cp -R $OMARCHY_PATH/config/* ~/.config/ +cp $OMARCHY_PATH/default/bashrc ~/.bashrc echo '[[ -f ~/.bashrc ]] && . ~/.bashrc' | tee ~/.bash_profile >/dev/null $(bash $OMARCHY_PATH/install/config/theme.sh) diff --git a/bin/omarchy-show-logo b/bin/omarchy-show-logo index 595bb487..1d6cfdf2 100755 --- a/bin/omarchy-show-logo +++ b/bin/omarchy-show-logo @@ -4,6 +4,6 @@ clear echo -e "\033[32m" -cat <~/.local/share/omarchy/logo.txt +cat <$OMARCHY_PATH/logo.txt echo -e "\033[0m" echo diff --git a/install/config/branding.sh b/install/config/branding.sh index bad55f09..e203b495 100644 --- a/install/config/branding.sh +++ b/install/config/branding.sh @@ -1,4 +1,4 @@ # Allow the user to change the branding for fastfetch and screensaver mkdir -p ~/.config/omarchy/branding -cp ~/.local/share/omarchy/icon.txt ~/.config/omarchy/branding/about.txt -cp ~/.local/share/omarchy/logo.txt ~/.config/omarchy/branding/screensaver.txt +cp $OMARCHY_PATH/icon.txt ~/.config/omarchy/branding/about.txt +cp $OMARCHY_PATH/logo.txt ~/.config/omarchy/branding/screensaver.txt diff --git a/install/packaging/fonts.sh b/install/packaging/fonts.sh index 38569582..c2796314 100644 --- a/install/packaging/fonts.sh +++ b/install/packaging/fonts.sh @@ -1,4 +1,4 @@ # Omarchy logo glyphs as a font (used by the omarchy-shell bar's left module) mkdir -p ~/.local/share/fonts -cp ~/.local/share/omarchy/config/omarchy.ttf ~/.local/share/fonts/ +cp $OMARCHY_PATH/config/omarchy.ttf ~/.local/share/fonts/ fc-cache diff --git a/install/post-install/finished.sh b/install/post-install/finished.sh index 5d1d9793..7d9b3ca1 100644 --- a/install/post-install/finished.sh +++ b/install/post-install/finished.sh @@ -6,7 +6,7 @@ echo_in_style() { clear echo -tte -i ~/.local/share/omarchy/logo.txt --canvas-width 0 --anchor-text c --frame-rate 920 laseretch +tte -i $OMARCHY_PATH/logo.txt --canvas-width 0 --anchor-text c --frame-rate 920 laseretch echo # Display installation time if available diff --git a/install/post-install/pacman.sh b/install/post-install/pacman.sh index 9d5747bc..dfa836b8 100644 --- a/install/post-install/pacman.sh +++ b/install/post-install/pacman.sh @@ -1,6 +1,6 @@ # Configure pacman -sudo cp -f ~/.local/share/omarchy/default/pacman/pacman-${OMARCHY_MIRROR:-stable}.conf /etc/pacman.conf -sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist-${OMARCHY_MIRROR:-stable} /etc/pacman.d/mirrorlist +sudo cp -f $OMARCHY_PATH/default/pacman/pacman-${OMARCHY_MIRROR:-stable}.conf /etc/pacman.conf +sudo cp -f $OMARCHY_PATH/default/pacman/mirrorlist-${OMARCHY_MIRROR:-stable} /etc/pacman.d/mirrorlist if lspci -nn | grep -q "106b:180[12]"; then cat </dev/null diff --git a/install/preflight/migrations.sh b/install/preflight/migrations.sh index 27819d13..52f81fb7 100644 --- a/install/preflight/migrations.sh +++ b/install/preflight/migrations.sh @@ -1,6 +1,6 @@ OMARCHY_MIGRATIONS_STATE_PATH=~/.local/state/omarchy/migrations mkdir -p $OMARCHY_MIGRATIONS_STATE_PATH -for file in ~/.local/share/omarchy/migrations/*.sh; do +for file in $OMARCHY_PATH/migrations/*.sh; do touch "$OMARCHY_MIGRATIONS_STATE_PATH/$(basename "$file")" done diff --git a/install/preflight/pacman.sh b/install/preflight/pacman.sh index c37d828d..cfe84943 100644 --- a/install/preflight/pacman.sh +++ b/install/preflight/pacman.sh @@ -3,8 +3,8 @@ if [[ -n ${OMARCHY_ONLINE_INSTALL:-} ]]; then omarchy-pkg-add base-devel # Configure pacman - sudo cp -f ~/.local/share/omarchy/default/pacman/pacman-${OMARCHY_MIRROR:-stable}.conf /etc/pacman.conf - sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist-${OMARCHY_MIRROR:-stable} /etc/pacman.d/mirrorlist + sudo cp -f $OMARCHY_PATH/default/pacman/pacman-${OMARCHY_MIRROR:-stable}.conf /etc/pacman.conf + sudo cp -f $OMARCHY_PATH/default/pacman/mirrorlist-${OMARCHY_MIRROR:-stable} /etc/pacman.d/mirrorlist sudo pacman-key --recv-keys 40DFB630FF42BCFFB047046CF0134EE680CAC571 --keyserver keys.openpgp.org sudo pacman-key --lsign-key 40DFB630FF42BCFFB047046CF0134EE680CAC571