From d74ad42b8495e7630fbae8c711ffcc6c4420ac58 Mon Sep 17 00:00:00 2001 From: FollieHiyuki Date: Sun, 25 Jul 2021 02:15:15 +0300 Subject: [PATCH] river: put XKB env var in the config --- home/.config/river/init | 3 +++ home/.local/bin/startwl | 7 ------- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/home/.config/river/init b/home/.config/river/init index e440d54..3193c9e 100755 --- a/home/.config/river/init +++ b/home/.config/river/init @@ -1,5 +1,8 @@ #!/bin/sh +export XKB_DEFAULT_LAYOUT="us,jp" +export XKB_DEFAULT_OPTIONS="grp:rshift_toggle" + # Output configuration ───────────────────────────────────────────────────────── riverctl spawn 'wlr-randr --output DP-2 --mode 1920x1080@60.000000Hz --pos -1920,0 --transform normal --scale 1.000000 --output eDP-1 --mode 1920x1080@60.000000Hz --pos 0,0 --transform normal --scale 1.000000 --output HDMI-A-1 --mode 1920x1080@60.000000Hz --pos 1920,0 --transform normal --scale 1.000000' diff --git a/home/.local/bin/startwl b/home/.local/bin/startwl index 16ebb74..738046a 100755 --- a/home/.local/bin/startwl +++ b/home/.local/bin/startwl @@ -29,13 +29,6 @@ export MOZ_ENABLE_WAYLAND=1 export PATH=$HOME/.local/bin/Wayland:$PATH -# river configures xkb through env vars -if [ "$1" = "river" ] -then - export XKB_DEFAULT_LAYOUT="us,jp" - export XKB_DEFAULT_OPTIONS="grp:rshift_toggle" -fi - export XDG_CURRENT_DESKTOP="$1" # $HOME/.config/emacs-config/doom/bin/doom env exec dbus-run-session "$@" > "${XDG_RUNTIME_DIR}/$1-$(date "+%Y-%m-%d").log" 2>&1