mirror of
https://github.com/arthur-pbty/arthur-os.git
synced 2026-08-01 20:28:16 +02:00
Drop dead hyprland conf-only migration references
Same logic as the waybar/mako sweep: migration 1778321093 converted the user's top-level hypr configs (autostart/bindings/hyprland/input/ looknfeel/monitors + envs + apps/*) from hyprlang `.conf` to Lua, so any earlier migration that seds those files is editing a path that no longer exists on the new layout. These were already applied on existing systems and skipped on fresh installs (preflight marks them done before they would run), so the change is purely repo cleanliness — the migrations dir stops mentioning files the new omarchy doesn't have. Deleted 18 migrations that only touched dead .conf paths: 1754389057 1755870033 1757866485 1757877123 1757877852 1760462260 1763386443 1767138576 1769543550 1770159912 1770375655 1771606249 1771847961 1772293693 1776410469 1776781957 1777620904 1778008689 Stripped dead .conf sed/cp blocks from 5 mixed migrations whose remaining work still matters (webapp launcher fixup, uwsm env/term config, xdg-terminal-exec install, Obsidian flags relocation, swayosd systemd service): 1755507891 1758019332 1762121828 1776434586 1778171768 The four genuinely-alive .conf files (hyprlock.conf, hypridle.conf, xdph.conf, hyprsunset.conf) are untouched. The converter migration (1778321093) is untouched. The lua-targeting migration 1757879836 is untouched.
This commit is contained in:
Ryan Hughes
@@ -1,11 +0,0 @@
|
||||
echo "Offer to reorganize hyprland.conf as per new defaults"
|
||||
|
||||
if [[ ! -f ~/.config/hypr/autostarts.conf ]]; then
|
||||
echo -e "\nOmarchy now splits default .config/hypr/hyprland.conf into sub-configs."
|
||||
echo -e "Resetting to defaults will overwrite your configuration, but save it as .bak.\n"
|
||||
if gum confirm "Use new default hyprland.conf config?"; then
|
||||
omarchy-refresh-hyprland || true
|
||||
else
|
||||
echo "Left your existing configuration in place!"
|
||||
fi
|
||||
fi
|
||||
@@ -11,11 +11,4 @@ for desktop_file in ~/.local/share/applications/*.desktop; do
|
||||
fi
|
||||
done
|
||||
|
||||
echo "Updating Hyprland bindings"
|
||||
HYPR_BINDINGS_FILE="$HOME/.config/hypr/bindings.conf"
|
||||
if [[ -f $HYPR_BINDINGS_FILE ]]; then
|
||||
sed -i 's/\$browser =.*chromium.*$/\$browser = omarchy-launch-browser/' "$HYPR_BINDINGS_FILE"
|
||||
sed -i 's/\$webapp="/omarchy-launch-webapp "/g' "$HYPR_BINDINGS_FILE"
|
||||
sed -i '/^\$webapp = \$browser --app/d' "$HYPR_BINDINGS_FILE"
|
||||
fi
|
||||
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
echo "Use current terminal shell cwd for new terminal working directories"
|
||||
|
||||
if ! grep -q "working-directory" ~/.config/hypr/bindings.conf; then
|
||||
sed -i '/bindd = SUPER, RETURN, Terminal, exec, \$terminal/ s|$| --working-directory=$(omarchy-cmd-terminal-cwd)|' ~/.config/hypr/bindings.conf
|
||||
fi
|
||||
@@ -1,6 +0,0 @@
|
||||
echo "Add SUPER + SHIFT + B to start browser in private mode"
|
||||
|
||||
if [[ -f ~/.config/hypr/bindings.conf ]] && grep -q "SUPER, B, Browser, exec" ~/.config/hypr/bindings.conf; then
|
||||
sed -i '/^bindd = SUPER, B, Browser, exec, \$browser$/a\
|
||||
bindd = SUPER SHIFT, B, Browser (private), exec, $browser --private' ~/.config/hypr/bindings.conf
|
||||
fi
|
||||
@@ -1,7 +0,0 @@
|
||||
echo "Obsidian should be using Wayland IME for better compatibility with fcitx5 and other languages"
|
||||
|
||||
if [[ -f ~/.config/hypr/bindings.conf ]]; then
|
||||
sed -i '/^bindd = SUPER, O, Obsidian, exec, uwsm app -- obsidian -disable-gpu/{
|
||||
/--enable-wayland-ime/! s/$/ --enable-wayland-ime/
|
||||
}' ~/.config/hypr/bindings.conf
|
||||
fi
|
||||
@@ -1,10 +0,0 @@
|
||||
echo "Switch select bindings to launch or focus mode"
|
||||
|
||||
if [[ -f ~/.config/hypr/bindings.conf ]]; then
|
||||
sed -i '/SUPER, M, Music, exec/ c\bindd = SUPER, M, Music, exec, omarchy-launch-or-focus spotify' ~/.config/hypr/bindings.conf
|
||||
sed -i '/SUPER, O, Obsidian, exec/ c\bindd = SUPER, O, Obsidian, exec, omarchy-launch-or-focus obsidian "uwsm-app -- obsidian -disable-gpu --enable-wayland-ime"' ~/.config/hypr/bindings.conf
|
||||
|
||||
sed -i '/SUPER, G, Signal, exec/ c\bindd = SUPER, G, Signal, exec, omarchy-launch-or-focus signal "uwsm-app -- signal-desktop"' ~/.config/hypr/bindings.conf
|
||||
sed -i '/SUPER SHIFT, G, WhatsApp, exec/ c\bindd = SUPER SHIFT, G, WhatsApp, exec, omarchy-launch-or-focus-webapp WhatsApp "https://web.whatsapp.com/"' ~/.config/hypr/bindings.conf
|
||||
sed -i '/SUPER ALT, G, Google Messages, exec/ c\bindd = SUPER ALT, G, Google Messages, exec, omarchy-launch-or-focus-webapp "Google Messages" "https://messages.google.com/web/conversations"' ~/.config/hypr/bindings.conf
|
||||
fi
|
||||
@@ -4,18 +4,3 @@ echo "Set \$TERMINAL and \$EDITOR in ~/.config/uwsm/default so entire system can
|
||||
omarchy-refresh-config uwsm/default
|
||||
omarchy-refresh-config uwsm/env
|
||||
omarchy-state set reboot-required
|
||||
|
||||
# Ensure scrolltouchpad setting applies to all terminals
|
||||
if grep -q "scrolltouchpad 1.5, class:Alacritty" ~/.config/hypr/input.conf; then
|
||||
sed -i 's/windowrule = scrolltouchpad 1\.5, class:Alacritty/windowrule = scrolltouchpad 1.5, tag:terminal/' ~/.config/hypr/input.conf
|
||||
fi
|
||||
|
||||
# Use default editor for keybinding
|
||||
if grep -q "bindd = SUPER, N, Neovim" ~/.config/hypr/bindings.conf; then
|
||||
sed -i '/SUPER, N, Neovim, exec/ c\bindd = SUPER, N, Editor, exec, omarchy-launch-editor' ~/.config/hypr/bindings.conf
|
||||
fi
|
||||
|
||||
# Use default terminal for keybinding
|
||||
if grep -q "terminal = uwsm app" ~/.config/hypr/bindings.conf; then
|
||||
sed -Ei '/terminal = uwsm[- ]app -- alacritty/ c\$terminal = uwsm-app -- $TERMINAL' ~/.config/hypr/bindings.conf
|
||||
fi
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
echo -e "Offer new Omarchy hotkeys\n"
|
||||
|
||||
cat <<EOF
|
||||
* Add SUPER + C / V for unified clipboard in both terminal and other apps
|
||||
* Add SUPER + CTRL + V for clipboard manager
|
||||
* Move fullscreen from F11 to SUPER + F
|
||||
* Keep terminal on SUPER + RETURN
|
||||
* Move app keys from SUPER + [LETTER] to SHIFT + SUPER + [LETTER]
|
||||
* Move toggling tiling/floating to SUPER + T
|
||||
EOF
|
||||
|
||||
echo -e "\nSwitching to new hotkeys will change your existing bindings.\nThe old ones will be backed up as ~/.config/hypr/bindings.conf.bak\n"
|
||||
|
||||
if gum confirm "Switch to new hotkeys?"; then
|
||||
cp ~/.config/hypr/bindings.conf ~/.config/hypr/bindings.conf.bak
|
||||
|
||||
sed -i 's/SUPER SHIFT,/SUPER SHIFT ALT,/g' ~/.config/hypr/bindings.conf
|
||||
sed -i 's/SUPER,/SUPER SHIFT,/g' ~/.config/hypr/bindings.conf
|
||||
sed -i 's/SUPER SHIFT, return, Terminal/SUPER, RETURN, Terminal/gI' ~/.config/hypr/bindings.conf
|
||||
sed -i 's/SUPER ALT,/SUPER SHIFT ALT,/g' ~/.config/hypr/bindings.conf
|
||||
sed -i 's/SUPER CTRL,/SUPER SHIFT CTRL,/g' ~/.config/hypr/bindings.conf
|
||||
sed -i 's/SUPER SHIFT ALT, G, Google Messages/SUPER SHIFT CTRL, G, Google Messages/g' ~/.config/hypr/bindings.conf
|
||||
|
||||
sed -i 's|source = ~/.local/share/omarchy/default/hypr/bindings/tiling\.conf|source = ~/.local/share/omarchy/default/hypr/bindings/clipboard.conf\
|
||||
source = ~/.local/share/omarchy/default/hypr/bindings/tiling-v2.conf|' ~/.config/hypr/hyprland.conf
|
||||
fi
|
||||
@@ -32,18 +32,5 @@ if command -v alacritty > /dev/null 2>&1; then
|
||||
cp "$OMARCHY_PATH/applications/Alacritty.desktop" ~/.local/share/applications/
|
||||
fi
|
||||
|
||||
# Update hyprland bindings to use xdg-terminal-exec
|
||||
sed -i 's/\$terminal = uwsm-app -- \$TERMINAL/$terminal = uwsm-app -- xdg-terminal-exec/' ~/.config/hypr/bindings.conf
|
||||
# Update --working-directory to --dir for xdg-terminal-exec
|
||||
sed -i 's/--working-directory=/--dir=/g' ~/.config/hypr/bindings.conf
|
||||
|
||||
# Update TERMINAL variable in uwsm config
|
||||
sed -i 's/export TERMINAL=.*/export TERMINAL=xdg-terminal-exec/' ~/.config/uwsm/default
|
||||
|
||||
# Update hyprland window rules to use DNS-format class names
|
||||
system_conf=~/.config/hypr/apps/system.conf
|
||||
if [[ -f $system_conf ]]; then
|
||||
if grep -q 'class:(.*|Impala|' "$system_conf" || grep -q 'class:(.*|Wiremix|' "$system_conf" || grep -q '|Omarchy|' "$system_conf"; then
|
||||
sed -i 's/\bImpala\b/com.omarchy.Impala/g; s/\bWiremix\b/com.omarchy.Wiremix/g; s/|Omarchy|/|com.omarchy.Omarchy|/g' "$system_conf"
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -1,4 +0,0 @@
|
||||
echo "Uniquely identify terminal apps with custom app-ids using omarchy-launch-tui"
|
||||
|
||||
# Replace terminal -e calls with omarchy-launch-tui in bindings
|
||||
sed -i 's/\$terminal -e \([^ ]*\)/omarchy-launch-tui \1/g' ~/.config/hypr/bindings.conf
|
||||
@@ -1,10 +0,0 @@
|
||||
echo "Update terminal scrolltouchpad setting to Hyprland 0.53 style"
|
||||
|
||||
if grep -q "scrolltouchpad" ~/.config/hypr/input.conf; then
|
||||
sed -Ei 's/^windowrule = scrolltouchpad ([^,]+), class:\(([^)]+)\)\s*$/windowrule = match:class (\2), scroll_touchpad \1/' ~/.config/hypr/input.conf
|
||||
sed -Ei 's/^windowrule = scrolltouchpad ([^,]+), class:([^ ]+)\s*$/windowrule = match:class \2, scroll_touchpad \1/' ~/.config/hypr/input.conf
|
||||
sed -Ei 's/^windowrule = scrolltouchpad ([^,]+), tag:terminal\s*$/windowrule = match:class (Alacritty|kitty), scroll_touchpad 1.5\nwindowrule = match:class com.mitchellh.ghostty, scroll_touchpad 0.2/' ~/.config/hypr/input.conf
|
||||
fi
|
||||
|
||||
# Ensure we restart to pair new Hyprland settings with new version
|
||||
omarchy-state set reboot-required
|
||||
@@ -1,6 +0,0 @@
|
||||
echo "Add SUPER+ALT+SHIFT+F shortcut to open nautilus in cwd"
|
||||
|
||||
# Add the new CWD binding if it doesn't exist
|
||||
if ! grep -q "SUPER ALT SHIFT, F" ~/.config/hypr/bindings.conf; then
|
||||
sed -i '/bindd = SUPER SHIFT, F, File manager, exec, uwsm-app -- nautilus --new-window/a bindd = SUPER ALT SHIFT, F, File manager (cwd), exec, uwsm-app -- nautilus --new-window "$(omarchy-cmd-terminal-cwd)"' ~/.config/hypr/bindings.conf
|
||||
fi
|
||||
@@ -1,32 +0,0 @@
|
||||
echo "Fix NVIDIA environment variables for Maxwell/Pascal/Volta GPUs"
|
||||
|
||||
# Detect if user has Maxwell/Pascal/Volta GPU (pre-Turing cards without GSP firmware)
|
||||
# Maxwell (GTX 9xx), Pascal (GT/GTX 10xx, Quadro P, MX series), Volta (Titan V, Tesla V100, Quadro GV100)
|
||||
NVIDIA="$(lspci | grep -i 'nvidia')"
|
||||
if echo "$NVIDIA" | grep -qE "GTX (9[0-9]{2}|10[0-9]{2})|GT 10[0-9]{2}|Quadro [PM][0-9]{3,4}|Quadro GV100|MX *[0-9]+|Titan (X|Xp|V)|Tesla V100"; then
|
||||
ENVS_CONF="$HOME/.config/hypr/envs.conf"
|
||||
|
||||
if [[ -f $ENVS_CONF ]]; then
|
||||
# Check if file contains problematic variables
|
||||
if grep -qE "env = (NVD_BACKEND,direct|LIBVA_DRIVER_NAME,nvidia)" "$ENVS_CONF"; then
|
||||
echo "Removing incompatible NVIDIA environment variables for legacy GPU..."
|
||||
|
||||
# Create backup
|
||||
cp "$ENVS_CONF" "$ENVS_CONF.bak.$(date +%s)"
|
||||
|
||||
# Remove all NVIDIA env lines and section headers (we re-add the correct ones below)
|
||||
sed -i '/^env = \(NVD_BACKEND\|LIBVA_DRIVER_NAME\|__GLX_VENDOR_LIBRARY_NAME\),/d; /^# NVIDIA/d' "$ENVS_CONF"
|
||||
|
||||
# Add correct environment variables for legacy GPUs
|
||||
cat >>"$ENVS_CONF" <<'EOF'
|
||||
|
||||
# NVIDIA (Maxwell/Pascal/Volta without GSP firmware)
|
||||
env = NVD_BACKEND,egl
|
||||
env = __GLX_VENDOR_LIBRARY_NAME,nvidia
|
||||
EOF
|
||||
|
||||
echo "NVIDIA environment variables updated. A backup was saved to $ENVS_CONF.bak.*"
|
||||
echo "Please restart Hyprland for changes to take effect."
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
@@ -1,5 +0,0 @@
|
||||
echo "Add Super+Shift+Return binding for browser"
|
||||
|
||||
if [[ -f ~/.config/hypr/bindings.conf ]] && ! grep -q "SUPER SHIFT, RETURN.*Browser" ~/.config/hypr/bindings.conf; then
|
||||
sed -i '/^bindd = SUPER, RETURN, Terminal/a bindd = SUPER SHIFT, RETURN, Browser, exec, omarchy-launch-browser' ~/.config/hypr/bindings.conf
|
||||
fi
|
||||
@@ -1,9 +0,0 @@
|
||||
echo "Re-run scrolltouchpad migration for configs with trailing whitespace"
|
||||
|
||||
if grep -q "scrolltouchpad" ~/.config/hypr/input.conf; then
|
||||
sed -Ei 's/^windowrule = scrolltouchpad ([^,]+), class:\(([^)]+)\)\s*$/windowrule = match:class (\2), scroll_touchpad \1/' ~/.config/hypr/input.conf
|
||||
sed -Ei 's/^windowrule = scrolltouchpad ([^,]+), class:([^ ]+)\s*$/windowrule = match:class \2, scroll_touchpad \1/' ~/.config/hypr/input.conf
|
||||
sed -Ei 's/^windowrule = scrolltouchpad ([^,]+), tag:terminal\s*$/windowrule = match:class (Alacritty|kitty), scroll_touchpad 1.5\nwindowrule = match:class com.mitchellh.ghostty, scroll_touchpad 0.2/' ~/.config/hypr/input.conf
|
||||
|
||||
omarchy-state set reboot-required
|
||||
fi
|
||||
@@ -1,7 +0,0 @@
|
||||
echo "Add Tmux binding (Super+Alt+Return) to hypr/bindings.conf"
|
||||
|
||||
bindings_file="$HOME/.config/hypr/bindings.conf"
|
||||
|
||||
if [[ -f $bindings_file ]] && ! grep -qE '^bindd?\s*=\s*SUPER\s+ALT\s*,\s*RETURN' "$bindings_file"; then
|
||||
sed -i '1a bindd = SUPER ALT, RETURN, Tmux, exec, uwsm-app -- xdg-terminal-exec --dir="$(omarchy-cmd-terminal-cwd)" tmux new' "$bindings_file"
|
||||
fi
|
||||
@@ -1,10 +0,0 @@
|
||||
echo "Move single_window_aspect_ratio from dwindle to layout in user looknfeel.conf"
|
||||
|
||||
looknfeel="$HOME/.config/hypr/looknfeel.conf"
|
||||
|
||||
if [[ -f $looknfeel ]] && grep -q 'single_window_aspect_ratio' "$looknfeel"; then
|
||||
sed -i \
|
||||
-e 's|# https://wiki.hypr.land/Configuring/Dwindle-Layout/|# https://wiki.hypr.land/Configuring/Variables/#layout|' \
|
||||
-e 's|^dwindle {|layout {|' \
|
||||
"$looknfeel"
|
||||
fi
|
||||
@@ -1,9 +0,0 @@
|
||||
echo "Add flags sourcing to hyprland.conf"
|
||||
|
||||
HYPR_CONF=~/.config/hypr/hyprland.conf
|
||||
|
||||
source "$OMARCHY_PATH/install/config/omarchy-toggles.sh"
|
||||
|
||||
if [[ -f $HYPR_CONF ]] && ! grep -q "toggles/hypr/\*\.conf" "$HYPR_CONF"; then
|
||||
echo -e "\n# Toggle config flags dynamically\nsource = ~/.local/state/omarchy/toggles/hypr/*.conf" >> "$HYPR_CONF"
|
||||
fi
|
||||
@@ -19,11 +19,4 @@ else
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ -f ~/.config/hypr/bindings.conf ]]; then
|
||||
sed -i '/Obsidian, exec/ {
|
||||
s/ -disable-gpu//g
|
||||
s/ --disable-gpu//g
|
||||
s/ --enable-wayland-ime//g
|
||||
s/"uwsm app -- obsidian/"uwsm-app -- obsidian/g
|
||||
}' ~/.config/hypr/bindings.conf
|
||||
fi
|
||||
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
echo "Drop vrr,1 from default monitor line as it creates a small lag"
|
||||
|
||||
MONITORS_CONF=~/.config/hypr/monitors.conf
|
||||
|
||||
if [[ -f $MONITORS_CONF ]]; then
|
||||
sed -i 's/^monitor=,preferred,auto,auto,vrr,1$/monitor=,preferred,auto,auto/' "$MONITORS_CONF"
|
||||
fi
|
||||
@@ -1,9 +0,0 @@
|
||||
echo "Add cliamp music TUI player (Super+Shift+Alt+M)"
|
||||
|
||||
if omarchy-pkg-missing cliamp; then
|
||||
omarchy-pkg-add cliamp
|
||||
|
||||
if [[ -f ~/.config/hypr/bindings.conf ]] && ! grep -q "cliamp" ~/.config/hypr/bindings.conf; then
|
||||
sed -i '/^bindd = SUPER SHIFT, M, Music, exec, omarchy-launch-or-focus spotify/a bindd = SUPER SHIFT ALT, M, Music TUI, exec, omarchy-launch-or-focus-tui cliamp' ~/.config/hypr/bindings.conf
|
||||
fi
|
||||
fi
|
||||
@@ -1,9 +0,0 @@
|
||||
echo "Add Foot terminal window rules where terminals are described"
|
||||
|
||||
if [[ -f ~/.config/hypr/input.conf ]]; then
|
||||
sed -Ei 's/match:class \(Alacritty\|kitty\)/match:class (Alacritty|kitty|foot)/' ~/.config/hypr/input.conf
|
||||
fi
|
||||
|
||||
if [[ -f ~/.config/hypr/apps/terminals.conf ]]; then
|
||||
sed -Ei 's/match:class \(Alacritty\|kitty\|com\.mitchellh\.ghostty\)/match:class (Alacritty|kitty|com.mitchellh.ghostty|foot)/' ~/.config/hypr/apps/terminals.conf
|
||||
fi
|
||||
@@ -3,10 +3,6 @@ echo "Run SwayOSD as a supervised session service"
|
||||
mkdir -p ~/.config/systemd/user
|
||||
cp "$OMARCHY_PATH/config/systemd/user/swayosd-server.service" ~/.config/systemd/user/swayosd-server.service
|
||||
|
||||
if [[ -f ~/.config/hypr/autostart.conf ]]; then
|
||||
sed -i '/^exec-once = uwsm-app -- swayosd-server$/d' ~/.config/hypr/autostart.conf
|
||||
fi
|
||||
|
||||
pkill -x swayosd-server || true
|
||||
|
||||
bash "$OMARCHY_PATH/install/first-run/swayosd.sh"
|
||||
|
||||
Reference in New Issue
Block a user