diff options
| author | yuzu-eva <stevenhu@web.de> | 2024-03-09 01:59:27 +0100 |
|---|---|---|
| committer | yuzu-eva <stevenhu@web.de> | 2024-03-09 01:59:27 +0100 |
| commit | 1c68684558c3062ff8fca66ee3dd870088fd56ee (patch) | |
| tree | 380cce5fb22e27f74d5381382fdd39f4ea764e6b /.config/x11/xinitrc | |
| parent | c5dcc86843b8f27628f901115eeda192d6260aca (diff) | |
| parent | f65e69f1f4b41785426bb830e73541aeb0d957e0 (diff) | |
Merge branch 'desktop'
merge into master, since the distinction is no longer neccessary
Diffstat (limited to '.config/x11/xinitrc')
| -rw-r--r-- | .config/x11/xinitrc | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc index 76a3ff5..091a42d 100644 --- a/.config/x11/xinitrc +++ b/.config/x11/xinitrc @@ -1,31 +1,29 @@ #!/bin/sh -if [ -d "/etc/X11/Xsession.d" ]; then - for f in /etc/X11/Xsession.d/*; do - [ -x "$f" ] && . "$f" - done - unset f +if command -v dbus-launch > /dev/null && test -z "${DBUS_SESSION_BUS_ADDRESS}"; then + eval $(dbus-launch --sh-syntax --exit-with-session) fi -rfkill block all - -eval "$(gpg-agent --daemon --allow-preset-passphrase --write-env-file "$envfile")" +eval "$(gpg-agent --daemon --allow-preset-passphrase)" eval "$(ssh-agent)" +xrandr --addmode HDMI-A-0 1280x960 +xrandr --output HDMI-A-0 --mode 1280x960 --primary +xrandr --output DisplayPort-1 --mode 1920x1080 --right-of HDMI-A-0 +xrandr --output DisplayPort-2 --mode 1600x900 --left-of HDMI-A-0 + xset r rate 250 30 xset s off -dpms setxkbmap -option "ctrl:nocaps" +xrdb -merge ~/.Xresources -xrandr --auto --output HDMI-A-0 --mode 1920x1080 --primary -xrandr --auto --output DisplayPort-2 --mode 1600x900 --left-of HDMI-A-0 +~/.local/bin/set-wallpaper & +/usr/bin/emacs --daemon & -ibus-daemon -dxrR -/usr/local/bin/emacs --daemon & -statusbar & +urxvtd -q -o -f & +ibus-daemon -d -r -x pipewire & -mpd & picom & -set-wallpaper & - -exec dwm +mpd & +exec i3 |