From 0bd09da3cd5cf89a9a4ccd2b7e9ee118ec6b0194 Mon Sep 17 00:00:00 2001 From: tiago Date: Thu, 22 Feb 2024 13:39:09 +0000 Subject: [PATCH] check if envycontrol exists --- .local/share/scripts/monitor.sh | 22 +++++++++-------- .xinitrc | 44 ++++++++++++++++++--------------- 2 files changed, 36 insertions(+), 30 deletions(-) diff --git a/.local/share/scripts/monitor.sh b/.local/share/scripts/monitor.sh index 33cae4d..740e451 100755 --- a/.local/share/scripts/monitor.sh +++ b/.local/share/scripts/monitor.sh @@ -1,15 +1,17 @@ #!/bin/sh -gpu_mode=$(/usr/bin/envycontrol -q) -if [ "$gpu_mode" = "nvidia" ]; then - xrandr --setprovideroutputsource modesetting NVIDIA-0 - xrandr --auto - xrandr --output HDMI-0 --above eDP-1-1 - xrandr --output HDMI-0 --primary -else - xrandr --auto - xrandr --output HDMI-1-0 --above eDP-1 - xrandr --output HDMI-1-0 --primary +if [ -f /usr/bin/envycontrol ]; then + gpu_mode=$(/usr/bin/envycontrol -q) + if [ "$gpu_mode" = "nvidia" ]; then + xrandr --setprovideroutputsource modesetting NVIDIA-0 + xrandr --auto + xrandr --output HDMI-0 --above eDP-1-1 + xrandr --output HDMI-0 --primary + else + xrandr --auto + xrandr --output HDMI-1-0 --above eDP-1 + xrandr --output HDMI-1-0 --primary + fi fi pkill picom diff --git a/.xinitrc b/.xinitrc index 2ff5092..33ddcd7 100755 --- a/.xinitrc +++ b/.xinitrc @@ -8,32 +8,32 @@ sysmodmap=/etc/X11/xinit/.Xmodmap # merge in defaults and keymaps if [ -f $sysresources ]; then - xrdb -merge $sysresources + xrdb -merge $sysresources fi if [ -f $sysmodmap ]; then - xmodmap $sysmodmap + xmodmap $sysmodmap fi if [ -f "$userresources" ]; then - xrdb -merge "$userresources" + xrdb -merge "$userresources" fi if [ -f "$usermodmap" ]; then - xmodmap "$usermodmap" + 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 +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 [ -f /usr/bin/prime-offload ]; then - /usr/bin/prime-offload + /usr/bin/prime-offload fi /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 & @@ -41,15 +41,19 @@ fi setxkbmap -layout us,pt setxkbmap -option grp:win_space_toggle -gpu_mode=$(/usr/bin/envycontrol -q) -if [ "$gpu_mode" = "nvidia" ]; then - xrandr --setprovideroutputsource modesetting NVIDIA-0 - xrandr --auto - xrandr --output HDMI-0 --above eDP-1-1 - xrandr --output HDMI-0 --primary -else - xrandr --auto - xrandr --output HDMI-1-0 --above eDP-1 - xrandr --output HDMI-1-0 --primary +# setup monitors (laptop only) +if [ -f /usr/bin/envycontrol ]; then + gpu_mode=$(/usr/bin/envycontrol -q) + if [ "$gpu_mode" = "nvidia" ]; then + xrandr --setprovideroutputsource modesetting NVIDIA-0 + xrandr --auto + xrandr --output HDMI-0 --above eDP-1-1 + xrandr --output HDMI-0 --primary + else + xrandr --auto + xrandr --output HDMI-1-0 --above eDP-1 + xrandr --output HDMI-1-0 --primary + fi fi + exec i3