From 67c9159938dedc8e66d500c9951c939b39d9c0db Mon Sep 17 00:00:00 2001 From: Flinner Yuu Date: Thu, 14 Jul 2022 13:53:04 +0300 Subject: [PATCH] feat: nvidia-xrun --- nvidia-xrun/.config/X11/nvidia-xinitrc | 44 ++++++++++++++++++++++ nvidia-xrun/.config/X11/nvidia-xinitrc.bak | 42 +++++++++++++++++++++ startx/.xinitrc | 8 ++-- 3 files changed, 91 insertions(+), 3 deletions(-) create mode 100644 nvidia-xrun/.config/X11/nvidia-xinitrc create mode 100644 nvidia-xrun/.config/X11/nvidia-xinitrc.bak diff --git a/nvidia-xrun/.config/X11/nvidia-xinitrc b/nvidia-xrun/.config/X11/nvidia-xinitrc new file mode 100644 index 0000000..1dea834 --- /dev/null +++ b/nvidia-xrun/.config/X11/nvidia-xinitrc @@ -0,0 +1,44 @@ +#!/bin/sh + +userresources=$HOME/.Xresources +usermodmap=$HOME/.Xmodmap +sysresources=/etc/X11/xinit/.Xresources +sysmodmap=/etc/X11/xinit/.Xmodmap + +# https://forum.archlabslinux.com/t/polybar-mirrored-laptop-hdmi-monitor-i3-workspaces-issue/3398 +# Polybar has issues, so just disconnect internal monitor +~/bin/disconnect-internal-monitor.sh + +eval `ssh-agent -s` +# merge in defaults and keymaps + +if [ -f $sysresources ]; then + xrdb -merge $sysresources +fi + +if [ -f $sysmodmap ]; then + xmodmap $sysmodmap +fi + +if [ -f "$userresources" ]; then + xrdb -merge "$userresources" +fi + +if [ -f "$usermodmap" ]; then + xmodmap "$usermodmap" +fi + +# start some nice programs + +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 + +if [ $# -gt 0 ]; then + $* +else + dbus-launch /usr/bin/bspwm +fi diff --git a/nvidia-xrun/.config/X11/nvidia-xinitrc.bak b/nvidia-xrun/.config/X11/nvidia-xinitrc.bak new file mode 100644 index 0000000..285dd71 --- /dev/null +++ b/nvidia-xrun/.config/X11/nvidia-xinitrc.bak @@ -0,0 +1,42 @@ +#!/bin/sh + +userresources=$HOME/.Xresources +usermodmap=$HOME/.Xmodmap +sysresources=/etc/X11/xinit/.Xresources +sysmodmap=/etc/X11/xinit/.Xmodmap + + +eval `ssh-agent -s` +# merge in defaults and keymaps + +if [ -f $sysresources ]; then + xrdb -merge $sysresources +fi + +if [ -f $sysmodmap ]; then + xmodmap $sysmodmap +fi + +if [ -f "$userresources" ]; then + xrdb -merge "$userresources" +fi + +if [ -f "$usermodmap" ]; then + xmodmap "$usermodmap" +fi + +# start some nice programs + +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 + +if [ $# -gt 0 ]; then + $* +else + /usr/bin/bspwm +fi + diff --git a/startx/.xinitrc b/startx/.xinitrc index e8ad038..816cb20 100644 --- a/startx/.xinitrc +++ b/startx/.xinitrc @@ -34,6 +34,8 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then unset f fi -/usr/bin/prime-offload -/usr/bin/bspwm -sudo /usr/bin/prime-switch +if [ $# -gt 0 ]; then + $* +else + dbus-launch /usr/bin/bspwm +fi