From a7c02cbb91c6b3e1469c1cbf5a8c60ee6b5fc0a2 Mon Sep 17 00:00:00 2001 From: Ian Mancini Date: Wed, 28 Oct 2020 02:46:00 -0300 Subject: [PATCH] Update Xorg config files --- template/x/.xinitrc | 13 +++++++------ template/x/.xprofile | 17 +++++++++++++++++ 2 files changed, 24 insertions(+), 6 deletions(-) create mode 100644 template/x/.xprofile diff --git a/template/x/.xinitrc b/template/x/.xinitrc index a2049e0..e5020da 100755 --- a/template/x/.xinitrc +++ b/template/x/.xinitrc @@ -1,14 +1,15 @@ -[[ -f ~/.Xdefaults ]] && xrdb -merge -I $HOME ~/.Xdefaults +#!/bin/sh +# +[ -f ~/.xprofile ] && . ~/.xprofile -export EDITOR="nvim" -export BROWSER="chromium" -export TERMINAL={{TERMINAL}} +if [ $HOST = 'ianmethyst-desktop-arch' ]; then + xrandr --output DisplayPort-0 --off --output DisplayPort-1 --off --output DisplayPort-2 --mode 1920x1080 --pos 0x0 --rotate normal --output HDMI-A-0 --off --output DVI-D-0 --off +fi -# Here Xfce is kept as default session=${1:-i3} case $session in i3|i3wm ) exec i3;; - steam|steamos ) steamos-session i3;; + steam|steamos ) exec steamos-session;; * ) exec $1;; esac diff --git a/template/x/.xprofile b/template/x/.xprofile new file mode 100644 index 0000000..03de63c --- /dev/null +++ b/template/x/.xprofile @@ -0,0 +1,17 @@ +#!/bin/sh + +[[ -f ~/.Xdefaults ]] && xrdb -merge -I $HOME ~/.Xdefaults + +if [ -d /etc/X11/xinit/xinitrc.d ] ; then + for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do + [ -x "$f" ] && . "$f" + done + unset f +fi + +export EDITOR="nvim" +export BROWSER="chromium" +export TERMINAL="alacritty" + +eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh) +export SSH_AUTH_SOCK