From 74ed27204ab3ad135dbc338f1ce3a3ca74adb477 Mon Sep 17 00:00:00 2001 From: Julian T Date: Mon, 11 May 2020 20:37:57 +0200 Subject: Changes to xinit and better wallpaper setting --- i3/.xinitrc | 2 +- scripts/Scripts/setwall | 2 +- xinit/Scripts/xlaunchrc | 13 ++++++++----- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/i3/.xinitrc b/i3/.xinitrc index 9aa3b88..a84d296 100644 --- a/i3/.xinitrc +++ b/i3/.xinitrc @@ -1,6 +1,6 @@ export LOPTS="composer" # Launch other stuff -source ~/Scripts/xlaunchrc +source ~/Scripts/xlaunchrc >> $HOME/.xlaunch.log exec i3 diff --git a/scripts/Scripts/setwall b/scripts/Scripts/setwall index c153aeb..cb47f61 100755 --- a/scripts/Scripts/setwall +++ b/scripts/Scripts/setwall @@ -1,3 +1,3 @@ #!/usr/bin/env bash -feh --bg-scale Pictures/defaultWall.* +feh --bg-fill Pictures/defaultWall.* diff --git a/xinit/Scripts/xlaunchrc b/xinit/Scripts/xlaunchrc index c9c7a21..c24f4d9 100755 --- a/xinit/Scripts/xlaunchrc +++ b/xinit/Scripts/xlaunchrc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -set +e +set -e setxkbmap -layout us -variant altgr-intl @@ -14,20 +14,16 @@ xmodmap .Xmodmap #xcape -e "Control_R=Escape" nm-applet & -xscreensaver & # set wallpaper ~/Scripts/setwall -xss-lock -- xscreensaver-command --lock & dunst & play ~/Winsounds/login.wav -q & # Set dbus display variable dbus-update-activation-environment --systemd DISPLAY -autorandr -c - for arg in "$LOPTS" do case $arg in @@ -43,6 +39,13 @@ do dbus-update-activation-environment --systemd DISPLAY & eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets) & ;; + *"screensaver"*) + xscreensaver & + xss-lock -- xscreensaver-command --lock & + ;; + *"autorandr"*) + autorandr -c + ;; esac done -- cgit v1.2.3