Rely on Omarchy bin being part of PATH everywhere
This commit is contained in:
@@ -12,9 +12,9 @@ if [[ -n "$font_name" && "$font_name" != "CNCLD" ]]; then
|
||||
-v "$font_name" \
|
||||
~/.config/fontconfig/fonts.conf
|
||||
|
||||
~/.local/share/omarchy/bin/omarchy-restart-waybar
|
||||
~/.local/share/omarchy/bin/omarchy-restart-swayosd
|
||||
~/.local/share/omarchy/bin/omarchy-restart-walker
|
||||
omarchy-restart-waybar
|
||||
omarchy-restart-swayosd
|
||||
omarchy-restart-walker
|
||||
else
|
||||
echo "Font '$font_name' not found."
|
||||
exit 1
|
||||
|
||||
@@ -5,4 +5,4 @@ curl -fsSL https://tailscale.com/install.sh | sh
|
||||
echo -e "\nStarting Tailscale..."
|
||||
sudo tailscale up --accept-routes
|
||||
|
||||
~/.local/share/omarchy/bin/omarchy-webapp-install "Tailscale" "https://login.tailscale.com/admin/machines" https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/tailscale-light.png
|
||||
omarchy-webapp-install "Tailscale" "https://login.tailscale.com/admin/machines" https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/tailscale-light.png
|
||||
|
||||
@@ -10,7 +10,7 @@ for m in $(hyprctl monitors -j | jq -r '.[] | .name'); do
|
||||
hyprctl dispatch exec -- \
|
||||
alacritty --class Screensaver \
|
||||
--config-file ~/.local/share/omarchy/default/alacritty/screensaver.toml \
|
||||
-e ~/.local/share/omarchy/bin/omarchy-cmd-screensaver
|
||||
-e omarchy-cmd-screensaver
|
||||
done
|
||||
|
||||
hyprctl dispatch focusmonitor $focused
|
||||
|
||||
@@ -26,7 +26,7 @@ terminal() {
|
||||
}
|
||||
|
||||
present_terminal() {
|
||||
alacritty --class Omarchy -e bash -c "~/.local/share/omarchy/bin/omarchy-show-logo; eval \"$1\"; ~/.local/share/omarchy/bin/omarchy-show-done;"
|
||||
alacritty --class Omarchy -e bash -c "omarchy-show-logo; eval \"$1\"; omarchy-show-done;"
|
||||
}
|
||||
|
||||
edit_in_nvim() {
|
||||
@@ -47,7 +47,7 @@ install_and_launch() {
|
||||
}
|
||||
|
||||
install_font() {
|
||||
present_terminal "echo 'Installing $1...'; yay -Sy --noconfirm --needed $2 && sleep 2 && ~/.local/share/omarchy/bin/omarchy-font-set '$3'"
|
||||
present_terminal "echo 'Installing $1...'; yay -Sy --noconfirm --needed $2 && sleep 2 && omarchy-font-set '$3'"
|
||||
}
|
||||
|
||||
show_learn_menu() {
|
||||
@@ -159,13 +159,13 @@ show_setup_power_menu() {
|
||||
show_setup_config_menu() {
|
||||
case $(menu "Setup" " Hyprland\n Hypridle\n Hyprlock\n Hyprsunset\n Swayosd\n Walker\n Waybar\n XCompose") in
|
||||
*Hyprland*) edit_in_nvim ~/.config/hypr/hyprland.conf ;;
|
||||
*Hypridle*) edit_in_nvim ~/.config/hypr/hypridle.conf && ~/.local/share/omarchy/bin/omarchy-restart-hypridle ;;
|
||||
*Hypridle*) edit_in_nvim ~/.config/hypr/hypridle.conf && omarchy-restart-hypridle ;;
|
||||
*Hyprlock*) edit_in_nvim ~/.config/hypr/hyprlock.conf ;;
|
||||
*Hyprsunset*) edit_in_nvim ~/.config/hypr/hyprsunset.conf && ~/.local/share/omarchy/bin/omarchy-restart-hyprsunset ;;
|
||||
*Swayosd*) edit_in_nvim ~/.config/swayosd/config.toml && ~/.local/share/omarchy/bin/omarchy-restart-swayosd ;;
|
||||
*Walker*) edit_in_nvim ~/.config/walker/config.toml && ~/.local/share/omarchy/bin/omarchy-restart-walker ;;
|
||||
*Waybar*) edit_in_nvim ~/.config/waybar/config.jsonc && ~/.local/share/omarchy/bin/omarchy-restart-waybar ;;
|
||||
*XCompose*) edit_in_nvim ~/.XCompose && ~/.local/share/omarchy/bin/omarchy-restart-xcompose ;;
|
||||
*Hyprsunset*) edit_in_nvim ~/.config/hypr/hyprsunset.conf && omarchy-restart-hyprsunset ;;
|
||||
*Swayosd*) edit_in_nvim ~/.config/swayosd/config.toml && omarchy-restart-swayosd ;;
|
||||
*Walker*) edit_in_nvim ~/.config/walker/config.toml && omarchy-restart-walker ;;
|
||||
*Waybar*) edit_in_nvim ~/.config/waybar/config.jsonc && omarchy-restart-waybar ;;
|
||||
*XCompose*) edit_in_nvim ~/.XCompose && omarchy-restart-xcompose ;;
|
||||
*) show_main_menu ;;
|
||||
esac
|
||||
}
|
||||
|
||||
@@ -14,5 +14,5 @@ pkg_name=$(yay -Slq | fzf "${fzf_args[@]}")
|
||||
if [[ -n "$pkg_name" ]]; then
|
||||
yay -Sy --noconfirm "$pkg_name"
|
||||
sudo updatedb
|
||||
~/.local/share/omarchy/bin/omarchy-show-done
|
||||
omarchy-show-done
|
||||
fi
|
||||
|
||||
@@ -14,5 +14,5 @@ pkg_name=$(yay -Qqe | fzf "${fzf_args[@]}")
|
||||
if [[ -n "$pkg_name" ]]; then
|
||||
yay -Rns --noconfirm "$pkg_name"
|
||||
sudo updatedb
|
||||
~/.local/share/omarchy/bin/omarchy-show-done
|
||||
omarchy-show-done
|
||||
fi
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#!/bin/bash
|
||||
|
||||
~/.local/share/omarchy/bin/omarchy-refresh-config hypr/hypridle.conf
|
||||
~/.local/share/omarchy/bin/omarchy-restart-hypridle
|
||||
omarchy-refresh-config hypr/hypridle.conf
|
||||
omarchy-restart-hypridle
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#!/bin/bash
|
||||
|
||||
~/.local/share/omarchy/bin/omarchy-refresh-config hypr/autostart.conf
|
||||
~/.local/share/omarchy/bin/omarchy-refresh-config hypr/bindings.conf
|
||||
~/.local/share/omarchy/bin/omarchy-refresh-config hypr/envs.conf
|
||||
~/.local/share/omarchy/bin/omarchy-refresh-config hypr/input.conf
|
||||
~/.local/share/omarchy/bin/omarchy-refresh-config hypr/hyprland.conf
|
||||
omarchy-refresh-config hypr/autostart.conf
|
||||
omarchy-refresh-config hypr/bindings.conf
|
||||
omarchy-refresh-config hypr/envs.conf
|
||||
omarchy-refresh-config hypr/input.conf
|
||||
omarchy-refresh-config hypr/hyprland.conf
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
#!/bin/bash
|
||||
|
||||
~/.local/share/omarchy/bin/omarchy-refresh-config hypr/hyprlock.conf
|
||||
omarchy-refresh-config hypr/hyprlock.conf
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#!/bin/bash
|
||||
|
||||
~/.local/share/omarchy/bin/omarchy-refresh-config hypr/hyprsunset.conf
|
||||
~/.local/share/omarchy/bin/omarchy-restart-hyprsunset
|
||||
omarchy-refresh-config hypr/hyprsunset.conf
|
||||
omarchy-restart-hyprsunset
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#!/bin/bash
|
||||
|
||||
~/.local/share/omarchy/bin/omarchy-refresh-config swayosd/config.toml
|
||||
~/.local/share/omarchy/bin/omarchy-refresh-config swayosd/style.css
|
||||
~/.local/share/omarchy/bin/omarchy-restart-swayosd
|
||||
omarchy-refresh-config swayosd/config.toml
|
||||
omarchy-refresh-config swayosd/style.css
|
||||
omarchy-restart-swayosd
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#!/bin/bash
|
||||
|
||||
~/.local/share/omarchy/bin/omarchy-refresh-config walker/config.toml
|
||||
~/.local/share/omarchy/bin/omarchy-restart-walker
|
||||
omarchy-refresh-config walker/config.toml
|
||||
omarchy-restart-walker
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#!/bin/bash
|
||||
|
||||
~/.local/share/omarchy/bin/omarchy-refresh-config waybar/config.jsonc
|
||||
~/.local/share/omarchy/bin/omarchy-refresh-config waybar/style.css
|
||||
~/.local/share/omarchy/bin/omarchy-restart-waybar
|
||||
omarchy-refresh-config waybar/config.jsonc
|
||||
omarchy-refresh-config waybar/style.css
|
||||
omarchy-restart-waybar
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
#!/bin/bash
|
||||
|
||||
~/.local/share/omarchy/bin/omarchy-restart-app hypridle
|
||||
omarchy-restart-app hypridle
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
#!/bin/bash
|
||||
|
||||
~/.local/share/omarchy/bin/omarchy-restart-app hyprsunset
|
||||
omarchy-restart-app hyprsunset
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
#!/bin/bash
|
||||
|
||||
~/.local/share/omarchy/bin/omarchy-restart-app swayosd-server
|
||||
omarchy-restart-app swayosd-server
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
#!/bin/bash
|
||||
|
||||
~/.local/share/omarchy/bin/omarchy-restart-app waybar
|
||||
omarchy-restart-app waybar
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
#!/bin/bash
|
||||
|
||||
~/.local/share/omarchy/bin/omarchy-restart-app fcitx5
|
||||
omarchy-restart-app fcitx5
|
||||
|
||||
@@ -30,4 +30,4 @@ if ! git clone "$REPO_URL" "$THEME_PATH"; then
|
||||
fi
|
||||
|
||||
# Apply the new theme with omarchy-theme-set
|
||||
~/.local/share/omarchy/bin/omarchy-theme-set $THEME_NAME
|
||||
omarchy-theme-set $THEME_NAME
|
||||
|
||||
@@ -30,5 +30,5 @@ NEXT_INDEX=$(((INDEX + 1) % TOTAL))
|
||||
NEW_THEME=${THEMES[$NEXT_INDEX]}
|
||||
NEW_THEME_NAME=$(basename "$NEW_THEME")
|
||||
|
||||
~/.local/share/omarchy/bin/omarchy-theme-set $NEW_THEME_NAME
|
||||
omarchy-theme-set $NEW_THEME_NAME
|
||||
notify-send "Theme changed to $NEW_THEME_NAME" -t 2000
|
||||
|
||||
@@ -33,7 +33,7 @@ fi
|
||||
|
||||
# Move to the next theme if the current theme is the one being removed
|
||||
if [ "$(readlink -f "$CURRENT_DIR/theme")" = "$(readlink -f "$THEME_PATH")" ]; then
|
||||
~/.local/share/omarchy/bin/omarchy-theme-next
|
||||
omarchy-theme-next
|
||||
fi
|
||||
|
||||
# Now remove the theme directory for THEME_NAME
|
||||
|
||||
@@ -44,10 +44,10 @@ touch "$HOME/.config/alacritty/alacritty.toml"
|
||||
|
||||
# Restart components to apply new theme
|
||||
pkill -SIGUSR2 btop
|
||||
~/.local/share/omarchy/bin/omarchy-restart-waybar
|
||||
~/.local/share/omarchy/bin/omarchy-restart-swayosd
|
||||
omarchy-restart-waybar
|
||||
omarchy-restart-swayosd
|
||||
makoctl reload
|
||||
hyprctl reload
|
||||
|
||||
# Set new background
|
||||
~/.local/share/omarchy/bin/omarchy-theme-bg-next
|
||||
omarchy-theme-bg-next
|
||||
|
||||
Reference in New Issue
Block a user