diff options
Diffstat (limited to 'raveos-hyprland-theme')
| -rw-r--r-- | raveos-hyprland-theme/PKGBUILD | 2 | ||||
| -rw-r--r-- | raveos-hyprland-theme/raveos-hyprland-apply.sh | 6 | ||||
| -rw-r--r-- | raveos-hyprland-theme/theme-data/hypr/config/keybinds.lua | 9 | ||||
| -rw-r--r-- | raveos-hyprland-theme/theme-data/raveswitch/config.ron | 2 |
4 files changed, 13 insertions, 6 deletions
diff --git a/raveos-hyprland-theme/PKGBUILD b/raveos-hyprland-theme/PKGBUILD index a9310cc..0166557 100644 --- a/raveos-hyprland-theme/PKGBUILD +++ b/raveos-hyprland-theme/PKGBUILD @@ -2,7 +2,7 @@ pkgname=raveos-hyprland-theme pkgver=1.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="RaveOS Hyprland theme payload and installer" arch=('any') url="https://raveos.local" diff --git a/raveos-hyprland-theme/raveos-hyprland-apply.sh b/raveos-hyprland-theme/raveos-hyprland-apply.sh index 6d7ab85..abd61f7 100644 --- a/raveos-hyprland-theme/raveos-hyprland-apply.sh +++ b/raveos-hyprland-theme/raveos-hyprland-apply.sh @@ -242,6 +242,10 @@ while IFS=: read -r user _ uid gid _ home shell; do cp -rf "${PAYLOAD}/hypr/." "${home}/.config/hypr/" rm -f "${home}/.config/hypr/hyprland.conf" set_hypr_keyboard "${home}/.config/hypr/hyprland.lua" + elif [[ -f "${home}/.config/hypr/config/keybinds.lua" && -f "${PAYLOAD}/hypr/config/keybinds.lua" ]]; then + if grep -q 'SUPER + TAB' "${home}/.config/hypr/config/keybinds.lua" 2>/dev/null; then + install -Dm644 "${PAYLOAD}/hypr/config/keybinds.lua" "${home}/.config/hypr/config/keybinds.lua" + fi fi # hyprpaper konfig @@ -307,6 +311,8 @@ SEOF # RaveSwitch if [[ ! -f "${home}/.config/raveswitch/config.ron" && -f "${PAYLOAD}/raveswitch/config.ron" ]]; then install -Dm644 "${PAYLOAD}/raveswitch/config.ron" "${home}/.config/raveswitch/config.ron" + elif [[ -f "${home}/.config/raveswitch/config.ron" ]]; then + sed -i 's/modifier: "Super"/modifier: "Alt"/' "${home}/.config/raveswitch/config.ron" 2>/dev/null || true fi # Flatpak global override diff --git a/raveos-hyprland-theme/theme-data/hypr/config/keybinds.lua b/raveos-hyprland-theme/theme-data/hypr/config/keybinds.lua index 62c734e..a072f88 100644 --- a/raveos-hyprland-theme/theme-data/hypr/config/keybinds.lua +++ b/raveos-hyprland-theme/theme-data/hypr/config/keybinds.lua @@ -12,7 +12,8 @@ for i = 1, 10 do end -- Shell Binds -hl.bind("SUPER + SUPER_L", hl.dsp.exec_cmd("dms ipc call spotlight toggle"), { release = true }) +hl.bind(mainMod .. "_L", function() end, { ignore_mods = true, transparent = true }) +hl.bind(mainMod .. "_L", hl.dsp.exec_cmd("dms ipc call spotlight toggle"), { ignore_mods = true, release = true }) hl.bind(mainMod .. " + P", hl.dsp.exec_cmd("dms ipc call clipboard toggle")) hl.bind(mainMod .. " + M", hl.dsp.exec_cmd("dms ipc call processlist toggle")) hl.bind(mainMod .. " + SHIFT + N", hl.dsp.exec_cmd("dms ipc call notifications toggle")) @@ -20,8 +21,9 @@ hl.bind(mainMod .. " + N", hl.dsp.exec_cmd("dms ipc call notepad toggle" hl.bind(mainMod .. " + S", hl.dsp.exec_cmd("dms ipc call settings toggle")) hl.bind(mainMod .. " + Y", hl.dsp.exec_cmd("dms ipc call dankdash wallpaper")) --- RaveSwitch -hl.bind("SUPER + TAB", hl.dsp.exec_cmd([[raveswitch socat '{"OpenSwitch":{"reverse":false}}']])) +-- RaveSwitch (Alt + Tab) +hl.bind("ALT + TAB", hl.dsp.exec_cmd([[raveswitch socat '{"OpenSwitch":{"reverse":false}}']])) +hl.bind("ALT + SHIFT + Tab", hl.dsp.exec_cmd([[raveswitch socat '{"OpenSwitch":{"reverse":true}}']])) -- Apps hl.bind(secondMod .. " + T", hl.dsp.exec_cmd("kitty")) @@ -37,7 +39,6 @@ hl.bind("CTRL + SUPER + End", hl.dsp.exec_cmd("poweroff")) -- Window management hl.bind(mainMod .. " + Q", hl.dsp.window.kill()) hl.bind(mainMod .. " + V", hl.dsp.window.float()) -hl.bind(mainMod .. " + SHIFT + Tab", hl.dsp.exec_cmd([[raveswitch socat '{"OpenSwitch":{"reverse":true}}']])) -- Move focus with mainMod + arrow keys hl.bind(mainMod .. " + left", hl.dsp.focus({ direction = "left" })) diff --git a/raveos-hyprland-theme/theme-data/raveswitch/config.ron b/raveos-hyprland-theme/theme-data/raveswitch/config.ron index 272265e..72bdd16 100644 --- a/raveos-hyprland-theme/theme-data/raveswitch/config.ron +++ b/raveos-hyprland-theme/theme-data/raveswitch/config.ron @@ -2,7 +2,7 @@ ( version: 4, windows: ( - switch: Some(modifier: "Super", key: "Tab", filter_by: [current_monitor], switch_workspaces: false, exclude_workspaces: "", kill_key: 'q'), + switch: Some(modifier: "Alt", key: "Tab", filter_by: [current_monitor], switch_workspaces: false, exclude_workspaces: "", kill_key: 'q'), ), behavior: ( close_on_mod_release: true, |