Prepare for wayland
This commit is contained in:
parent
513e3b8263
commit
8b82ba2445
GPG key ID:
13AD60C237A28DFE
7 changed files with 62 additions and 11 deletions
|
|
@ -1,9 +1,26 @@
|
|||
#!/bin/sh
|
||||
|
||||
set -a
|
||||
. "$HOME/.config/user-dirs.dirs"
|
||||
. "$XDG_CONFIG_HOME/locale.conf"
|
||||
set +a
|
||||
|
||||
export ANDROID_SDK_ROOT='/opt/android-sdk'
|
||||
export AUTOSTART_DISPLAY='startx'
|
||||
|
||||
export BEMENU_OPTS="--tb '#6272a4'\
|
||||
--tf '#f8f8f2'\
|
||||
--fb '#282a36'\
|
||||
--ff '#f8f8f2'\
|
||||
--nb '#282a36'\
|
||||
--nf '#6272a4'\
|
||||
--hb '#44475a'\
|
||||
--hf '#50fa7b'\
|
||||
--sb '#44475a'\
|
||||
--sf '#50fa7b'\
|
||||
--scb '#282a36'\
|
||||
--scf '#ff79c6'\
|
||||
--list 25 --ignorecase"
|
||||
|
||||
export CM_LAUNCHER='rofi'
|
||||
|
||||
|
|
@ -19,6 +36,7 @@ export KUBECONFIG="$HOME/.kube/config"
|
|||
export MAILCAPS="$XDG_CONFIG_HOME/mailcap/mailcaprc"
|
||||
export MAKEFLAGS="-j$(grep -c ^processor /proc/cpuinfo)"
|
||||
export MARKPATH="$XDG_CONFIG_HOME/zsh/jump_marks"
|
||||
export MENU="bemenu"
|
||||
|
||||
export NOTMUCH_CONFIG="$XDG_CONFIG_HOME/notmuch/config"
|
||||
|
||||
|
|
@ -41,4 +59,6 @@ export ZSH="$ZDOTDIR/oh-my-zsh"
|
|||
|
||||
[ -x "$(command -v bat)" ] && export MANPAGER="sh -c 'col -bx | bat -l man -p'"
|
||||
|
||||
set -a
|
||||
[ -f "$HOME/.config/environment.local" ] && . "$HOME/.config/environment.local"
|
||||
set +a
|
||||
|
|
|
|||
|
|
@ -24,8 +24,8 @@ get_icon() {
|
|||
echo $icon
|
||||
}
|
||||
|
||||
KEY="$OPENWEATHER_KEY"
|
||||
CITY="$OPENWEATHER_CITY"
|
||||
KEY="$OPENWEATHERMAP_API_KEY"
|
||||
CITY="$OPENWEATHERMAP_PLACE"
|
||||
UNITS="metric"
|
||||
SYMBOL="°"
|
||||
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ super + ctrl + Print
|
|||
|
||||
|
||||
super + Pause
|
||||
rofi-shutdown
|
||||
menu-shutdown
|
||||
|
||||
#
|
||||
# wm independent media hotkeys
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh
|
||||
|
||||
action=$(echo -e "Shutdown\nReboot\nLogout" | rofi -dmenu)
|
||||
action=$(echo -e "Shutdown\nReboot\nLogout" | $MENU)
|
||||
|
||||
case "$action" in
|
||||
"Shutdown")
|
||||
|
|
@ -12,6 +12,7 @@ bind "8" "slot8"
|
|||
bind "9" "slot9"
|
||||
bind "a" "+moveleft"
|
||||
bind "b" "buymenu"
|
||||
bind "c" "show_loadout_toggle"
|
||||
bind "d" "+moveright"
|
||||
bind "e" "+use"
|
||||
bind "f" "+lookatweapon"
|
||||
|
|
@ -24,6 +25,8 @@ bind "q" "lastinv"
|
|||
bind "r" "+reload"
|
||||
bind "s" "+back"
|
||||
bind "t" "+spray_menu"
|
||||
bind "u" "messagemode2"
|
||||
bind "v" "callvote"
|
||||
bind "w" "+forward"
|
||||
bind "x" "slot12"
|
||||
bind "z" "radio"
|
||||
|
|
@ -138,8 +141,8 @@ c_thirdpersonshoulderaimdist "120.0"
|
|||
c_thirdpersonshoulderdist "40.0"
|
||||
c_thirdpersonshoulderheight "5.0"
|
||||
c_thirdpersonshoulderoffset "20.0"
|
||||
cachedvalue_count_partybrowser "1646250258"
|
||||
cachedvalue_count_teammates "1646486285"
|
||||
cachedvalue_count_partybrowser "1647470100"
|
||||
cachedvalue_count_teammates "1647818762"
|
||||
cam_collision "1"
|
||||
cam_idealdelta "4.0"
|
||||
cam_idealdist "150"
|
||||
|
|
@ -187,11 +190,11 @@ cl_crosshaircolor_b "0.000000"
|
|||
cl_crosshaircolor_g "255.000000"
|
||||
cl_crosshaircolor_r "0.000000"
|
||||
cl_crosshairdot "0"
|
||||
cl_crosshairgap "-0.995412"
|
||||
cl_crosshairgap "-1.967399"
|
||||
cl_crosshairgap_useweaponvalue "0"
|
||||
cl_crosshairsize "0.485989"
|
||||
cl_crosshairstyle "4"
|
||||
cl_crosshairthickness "0.971678"
|
||||
cl_crosshairthickness "1.476333"
|
||||
cl_crosshairusealpha "1"
|
||||
cl_debugrumble "0"
|
||||
cl_detail_avoid_force "0.4"
|
||||
|
|
@ -282,11 +285,11 @@ cl_scoreboard_survivors_always_on "0"
|
|||
cl_show_clan_in_death_notice "0"
|
||||
cl_show_observer_crosshair "2"
|
||||
cl_showhelp "1"
|
||||
cl_showloadout "0"
|
||||
cl_showloadout "1"
|
||||
cl_showpluginmessages2 "0"
|
||||
cl_sniper_delay_unscope "0"
|
||||
cl_spec_follow_grenade_key "0"
|
||||
cl_spec_mode "4"
|
||||
cl_spec_mode "5"
|
||||
cl_tablet_mapmode "2"
|
||||
cl_teamid_overhead_mode "2"
|
||||
cl_teammate_colors_show "1"
|
||||
|
|
|
|||
26
.xprofile
26
.xprofile
|
|
@ -25,6 +25,28 @@ wait_for_service()
|
|||
done
|
||||
}
|
||||
|
||||
wait_for_user_service()
|
||||
{
|
||||
until systemctl --user is-active --quiet "$1"
|
||||
do
|
||||
sleep 0.5
|
||||
done
|
||||
}
|
||||
|
||||
_autostart_audio()
|
||||
{
|
||||
wait_for_user_service "pipewire.service"
|
||||
wait_for_user_service "wireplumber.service"
|
||||
|
||||
sleep 5
|
||||
|
||||
pw-link 'default-sink:monitor_FL' 'alsa_output.usb-BEHRINGER_UMC202HD_192k-00.analog-stereo:playback_FL'
|
||||
pw-link 'default-sink:monitor_FR' 'alsa_output.usb-BEHRINGER_UMC202HD_192k-00.analog-stereo:playback_FR'
|
||||
|
||||
pw-link 'default-sink:monitor_FL' 'alsa_output.pci-0000_00_1f.3.analog-stereo:playback_FL'
|
||||
pw-link 'default-sink:monitor_FR' 'alsa_output.pci-0000_00_1f.3.analog-stereo:playback_FR'
|
||||
}
|
||||
|
||||
_autostart_workspace_voip()
|
||||
{
|
||||
#/opt/teamspeak5/TeamSpeak &
|
||||
|
|
@ -73,12 +95,14 @@ _autostart_apps()
|
|||
mopidy &
|
||||
|
||||
/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &
|
||||
systemctl --user start spotifyd.service &
|
||||
}
|
||||
|
||||
_autostart()
|
||||
{
|
||||
### wait for audio
|
||||
start_jack
|
||||
#start_jack
|
||||
_autostart_audio
|
||||
|
||||
### wait for internet
|
||||
wait_for_service "network-online.target"
|
||||
|
|
|
|||
|
|
@ -5,3 +5,7 @@ if [ -x "$(command -v gpgconf)" ]; then
|
|||
export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
|
||||
gpgconf --launch gpg-agent
|
||||
fi
|
||||
|
||||
if [ -z $DISPLAY ] && [ "$(tty)" = "/dev/tty1" ]; then
|
||||
exec $AUTOSTART_DISPLAY
|
||||
fi
|
||||
|
|
|
|||
Loading…
Reference in a new issue