diff --git a/.config/X11/xinitrc b/.config/X11/xinitrc index 6bbb7d6..a8145a8 100644 --- a/.config/X11/xinitrc +++ b/.config/X11/xinitrc @@ -16,20 +16,11 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then fi # ================================== -export LANG=zh_CN.UTF-8 -export GTK_IM_MODULE=fcitx -export QT_IM_MODULE=fcitx -export XMODIFIERS=@im=fcitx -export QT_QPA_PLATFORMTHEME=qt5ct +source ${XDG_CONFIG_HOME}/X11/xprofile -export BROWSER=firefox -# Enable VA-API support for firefox -export MOZ_X11_EGL=1 - -# swap Caps_Lock and Escape -setxkbmap -option caps:swapescape -# swap Ctrl_R and Alt_R -setxkbmap -option ctrl:rctrl_ralt -setxkbmap -option ctrl:ralt_rctrl +# alternative program +if [[ -n "$@" ]]; then + exec "$@" +fi exec qtile diff --git a/.config/X11/xprofile b/.config/X11/xprofile new file mode 100644 index 0000000..af132d4 --- /dev/null +++ b/.config/X11/xprofile @@ -0,0 +1,7 @@ +export LANG=zh_CN.UTF-8 + +# swap Caps_Lock and Escape +setxkbmap -option caps:swapescape +# swap Ctrl_R and Alt_R +setxkbmap -option ctrl:rctrl_ralt +setxkbmap -option ctrl:ralt_rctrl diff --git a/.pam_environment b/.pam_environment index 30553e6..c4d9faf 100644 --- a/.pam_environment +++ b/.pam_environment @@ -11,6 +11,18 @@ XDG_DATA_HOME DEFAULT=@{HOME}/.data # gtk2 GTK2_RC_FILES DEFAULT=${XDG_CONFIG_HOME}/gtk-2.0/gtkrc +# qt5 +QT_QPA_PLATFORMTHEME DEFAULT=qt5ct + +# fcitx +GTK_IM_MODULE DEFAULT=fcitx +QT_IM_MODULE DEFAULT=fcitx +XMODIFIERS DEFAULT=@im=fcitx + +# firefox +# Enable VA-API support +MOZ_X11_EGL DEFAULT=1 + # readline INPUTRC DEFAULT=${XDG_CONFIG_HOME}/readline/inputrc