Add wayland stuff
This commit is contained in:
parent
77c58e5f98
commit
1b096b242a
7 changed files with 34 additions and 53 deletions
|
@ -81,6 +81,7 @@ bspc rule -a 'Zathura' state='tiled'
|
||||||
bspc rule -a 'firefox' desktop='web'
|
bspc rule -a 'firefox' desktop='web'
|
||||||
bspc rule -a 'qutebrowser' desktop='web'
|
bspc rule -a 'qutebrowser' desktop='web'
|
||||||
bspc rule -a 'Gcr-prompter' desktop='web'
|
bspc rule -a 'Gcr-prompter' desktop='web'
|
||||||
|
bspc rule -a 'KeePassXC:keepassxc:Unlock Database - KeePassXC' desktop='web'
|
||||||
|
|
||||||
bspc rule -a 'qutebrowser:kiosk' follow='true' desktop='side-view' state='fullscreen'
|
bspc rule -a 'qutebrowser:kiosk' follow='true' desktop='side-view' state='fullscreen'
|
||||||
bspc rule -a 'firefox:Toolkit' follow='true' desktop='side-view' state='fullscreen'
|
bspc rule -a 'firefox:Toolkit' follow='true' desktop='side-view' state='fullscreen'
|
||||||
|
|
|
@ -31,10 +31,14 @@ export EDITOR='/usr/bin/vim'
|
||||||
|
|
||||||
export GOPATH="$XDG_DATA_HOME/go"
|
export GOPATH="$XDG_DATA_HOME/go"
|
||||||
|
|
||||||
|
_hostname=$(cat /proc/sys/kernel/hostname)
|
||||||
|
export HOSTNAME="$_hostname"
|
||||||
|
|
||||||
export KUBECONFIG="$HOME/.kube/config"
|
export KUBECONFIG="$HOME/.kube/config"
|
||||||
|
|
||||||
export MAILCAPS="$XDG_CONFIG_HOME/mailcap/mailcaprc"
|
export MAILCAPS="$XDG_CONFIG_HOME/mailcap/mailcaprc"
|
||||||
export MAKEFLAGS="-j$(grep -c ^processor /proc/cpuinfo)"
|
_makeflags=$(grep -c ^processor /proc/cpuinfo)
|
||||||
|
export MAKEFLAGS="-j$_makeflags"
|
||||||
export MARKPATH="$XDG_CONFIG_HOME/zsh/jump_marks"
|
export MARKPATH="$XDG_CONFIG_HOME/zsh/jump_marks"
|
||||||
export MENU="bemenu"
|
export MENU="bemenu"
|
||||||
|
|
||||||
|
@ -46,8 +50,11 @@ export OSH="$XDG_CONFIG_HOME/bash/oh-my-bash"
|
||||||
export PASSWORD_STORE_GENERATED_LENGTH='64'
|
export PASSWORD_STORE_GENERATED_LENGTH='64'
|
||||||
export PATH="$HOME/.local/bin:/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin:$GOPATH/bin:$HOME/.cargo/bin"
|
export PATH="$HOME/.local/bin:/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin:$GOPATH/bin:$HOME/.cargo/bin"
|
||||||
|
|
||||||
|
export QT_QPA_PLATFORM="wayland;xcb"
|
||||||
export QT_QPA_PLATFORMTHEME="qt5ct"
|
export QT_QPA_PLATFORMTHEME="qt5ct"
|
||||||
|
|
||||||
|
#export SDL_VIDEODRIVER="wayland"
|
||||||
|
|
||||||
export TERMINAL="alacritty"
|
export TERMINAL="alacritty"
|
||||||
|
|
||||||
export VIMINIT="source $XDG_CONFIG_HOME/vim/vimrc"
|
export VIMINIT="source $XDG_CONFIG_HOME/vim/vimrc"
|
||||||
|
|
|
@ -8,11 +8,11 @@ super + Return
|
||||||
|
|
||||||
# program launcher
|
# program launcher
|
||||||
super + d
|
super + d
|
||||||
rofi -show
|
LANG=C rofi -show
|
||||||
|
|
||||||
# password manger
|
# password manger
|
||||||
super + p
|
super + p
|
||||||
rofi-pass
|
LANG=C rofi-pass
|
||||||
|
|
||||||
# make sxhkd reload its configuration files:
|
# make sxhkd reload its configuration files:
|
||||||
super + Escape
|
super + Escape
|
||||||
|
|
15
.local/bin/wait-for-service
Executable file
15
.local/bin/wait-for-service
Executable file
|
@ -0,0 +1,15 @@
|
||||||
|
#!/usr/bin/env sh
|
||||||
|
|
||||||
|
user=""
|
||||||
|
target="$1"
|
||||||
|
|
||||||
|
if [ "$1" = "--user" ]; then
|
||||||
|
user="--user"
|
||||||
|
target="$2"
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
until systemctl $user is-active --quiet "$target"
|
||||||
|
do
|
||||||
|
sleep 0.5
|
||||||
|
done
|
|
@ -44,7 +44,7 @@ Comment[it]= Un browser web vim-like utilizzabile da tastiera basato su PyQt5
|
||||||
Icon=qutebrowser
|
Icon=qutebrowser
|
||||||
Type=Application
|
Type=Application
|
||||||
Categories=Network;WebBrowser;
|
Categories=Network;WebBrowser;
|
||||||
Exec=qutebrowser -B .local/share/qutebrowser-kiosk -C .config/qutebrowser/config_kiosk.py --qt-arg name kiosk %u
|
Exec=qutebrowser -B .local/share/qutebrowser-kiosk -C .config/qutebrowser/config_kiosk.py --desktop-file-name org.qutebrowser.qutebrowser-kiosk --qt-arg name kiosk %u
|
||||||
Terminal=false
|
Terminal=false
|
||||||
StartupNotify=true
|
StartupNotify=true
|
||||||
MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/qute;
|
MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/qute;
|
||||||
|
|
47
.xprofile
47
.xprofile
|
@ -5,47 +5,6 @@ numlockx on
|
||||||
setxkbmap de
|
setxkbmap de
|
||||||
setxkbmap -option caps:none
|
setxkbmap -option caps:none
|
||||||
|
|
||||||
if [ -x "$(command -v gpgconf)" ]
|
|
||||||
then
|
|
||||||
ssh_sock=$(gpgconf --list-dirs agent-ssh-socket)
|
|
||||||
export SSH_AUTH_SOCK="$ssh_sock"
|
|
||||||
gpgconf --launch gpg-agent
|
|
||||||
gpg2 --card-status > /dev/null
|
|
||||||
fi
|
|
||||||
|
|
||||||
network_wait_pid=1
|
|
||||||
audio_wait_pid=1
|
|
||||||
|
|
||||||
|
|
||||||
wait_for_service()
|
|
||||||
{
|
|
||||||
until systemctl is-active --quiet "$1"
|
|
||||||
do
|
|
||||||
sleep 0.5
|
|
||||||
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()
|
_autostart_workspace_voip()
|
||||||
{
|
{
|
||||||
|
@ -79,15 +38,11 @@ _autostart_apps()
|
||||||
|
|
||||||
#actkbd --grab --config ~/.config/actkbd/actkbd.conf --device /dev/input/by-id/usb-Dell_Dell_USB_Keyboard-event-kbd &
|
#actkbd --grab --config ~/.config/actkbd/actkbd.conf --device /dev/input/by-id/usb-Dell_Dell_USB_Keyboard-event-kbd &
|
||||||
|
|
||||||
wait $network_wait_pid
|
|
||||||
|
|
||||||
syncthing -no-browser &
|
syncthing -no-browser &
|
||||||
/usr/lib/kdeconnectd &
|
/usr/lib/kdeconnectd &
|
||||||
#transmission-gtk --minimized &
|
#transmission-gtk --minimized &
|
||||||
qbittorrent &
|
qbittorrent &
|
||||||
|
|
||||||
wait $audio_wait_pid
|
|
||||||
|
|
||||||
#steam-runtime -silent -tcp &
|
#steam-runtime -silent -tcp &
|
||||||
flatpak run com.valvesoftware.Steam -silent &
|
flatpak run com.valvesoftware.Steam -silent &
|
||||||
qutebrowser &
|
qutebrowser &
|
||||||
|
@ -102,7 +57,7 @@ _autostart()
|
||||||
{
|
{
|
||||||
### wait for audio
|
### wait for audio
|
||||||
#start_jack
|
#start_jack
|
||||||
_autostart_audio
|
start_audio pipewire
|
||||||
|
|
||||||
### wait for internet
|
### wait for internet
|
||||||
wait_for_service "network-online.target"
|
wait_for_service "network-online.target"
|
||||||
|
|
|
@ -1,11 +1,14 @@
|
||||||
. "$HOME/.config/environment"
|
. "$HOME/.config/environment"
|
||||||
. "$HOME/.config/aliasrc"
|
. "$HOME/.config/aliasrc"
|
||||||
|
|
||||||
if [ -x "$(command -v gpgconf)" ]; then
|
if [ -x "$(command -v gpgconf)" ]
|
||||||
export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
|
then
|
||||||
|
ssh_sock=$(gpgconf --list-dirs agent-ssh-socket)
|
||||||
|
export SSH_AUTH_SOCK="$ssh_sock"
|
||||||
gpgconf --launch gpg-agent
|
gpgconf --launch gpg-agent
|
||||||
|
gpg2 --card-status > /dev/null
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -z $DISPLAY ] && [ "$(tty)" = "/dev/tty1" ]; then
|
if [ -z $DISPLAY ] && [ "$(tty)" = "/dev/tty1" ]; then
|
||||||
exec $AUTOSTART_DISPLAY
|
exec $AUTOSTART_DISPLAY
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue