Use nitrogen to set backgrounds

[max/saltfiles.git] / states / i3 / files / xprofile.jinja

diff --git a/states/i3/files/xprofile.jinja b/states/i3/files/xprofile.jinja
index fcc1f7aef941443fabefb9ae4ddcd2122495a210..e5aa42f06225ba50ecf4ea46e73bb4af71140127 100755 (executable)
--- a/states/i3/files/xprofile.jinja
+++ b/states/i3/files/xprofile.jinja
@@ -1,20 +1,14 @@
 #!/bin/sh
 # Load .Xresources
 xrdb -merge ~/.Xresources &> /dev/null
-if [ -f ~/.Xresources.$HOSTNAME ]; then
-  xrdb -merge ~/.Xresources.$HOSTNAME &> /dev/null
-fi
 
 # Set keyboard layout
 case $HOSTNAME in
   barium)
-    layout-colemak_us
+    layout-qwerty_gb
     ;;
   dubnium)
-    setxkbmap -variant colemak us
-    xmodmap -e "keycode 66 = Control_L Control_L Control_L Control_L"
-    xmodmap -e "keycode 135 = Control_R Control_R Control_R Control_R"
-    xmodmap -e "add Control = Control_L Control_R"
+    layout-qwerty_gb
     ;;
   *)
     layout-colemak_gb
@@ -24,13 +18,14 @@ esac
 # Set screen layout
 case $HOSTNAME in
   barium)
-    xrandr --output DP-1 --mode 1920x1080 --pos 0x540
-    xrandr --output HDMI-1 --mode 3840x2160 --pos 1920x0
-    xrandr --output eDP-1 --mode 1920x1080 --pos 0x540
+    xrandr --output DP-2 --mode 3840x2160 --pos 2560x0 --rate 30
+    xrandr --output DP-1 --mode 2560x1440 --pos 0x360
+    #xrandr --output eDP-1 --off
     ;;
   dubnium)
-    xrandr --output DVI-D-1 --mode 1920x1080 --pos 0x540
-    xrandr --output DP-1 --mode 3840x2160 --pos 1920x0
+    xrandr --output DP-0 --mode 2560x1440 --pos 0x0
+    xrandr --output DP-2 --mode 3840x2160 --pos 2560x0
+    xrandr --output DP-0 --primary
     ;;
   *)
     ;;
@@ -39,7 +34,7 @@ esac
 # Set java font option
 export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on"
 
-feh --bg-scale ~/Pictures/background_1080_1.png&
+nitrogen --restore &
 
 xset -b