Merge branch 'master' of git.friedersdorff.com:max/saltfiles

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

diff --git a/states/i3/files/xprofile.jinja b/states/i3/files/xprofile.jinja
index 11877f66c546dabb5c536e4b23c916baff59b837..fcc1f7aef941443fabefb9ae4ddcd2122495a210 100755 (executable)
--- a/states/i3/files/xprofile.jinja
+++ b/states/i3/files/xprofile.jinja
@@ -8,16 +8,16 @@ fi
 # Set keyboard layout
 case $HOSTNAME in
   barium)
+    layout-colemak_us
+    ;;
+  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"
     ;;
   *)
-    setxkbmap -variant colemak gb
-    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-colemak_gb
     ;;
 esac
 
@@ -28,6 +28,10 @@ case $HOSTNAME in
     xrandr --output HDMI-1 --mode 3840x2160 --pos 1920x0
     xrandr --output eDP-1 --mode 1920x1080 --pos 0x540
     ;;
+  dubnium)
+    xrandr --output DVI-D-1 --mode 1920x1080 --pos 0x540
+    xrandr --output DP-1 --mode 3840x2160 --pos 1920x0
+    ;;
   *)
     ;;
 esac
@@ -37,8 +41,6 @@ export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on"
 
 feh --bg-scale ~/Pictures/background_1080_1.png&
 
-dunst&
-
 xset -b
 
 export QT_QPA_PLATFORM="xcb"