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

diff --git a/states/sway/files/dubnium b/states/sway/files/dubnium
index 0c7a4b33b33057e4e2e81287403216e8315ac98d..e078f82531586a9c7d31fa61dead43c2be556ea8 100644 (file)
--- a/states/sway/files/dubnium
+++ b/states/sway/files/dubnium
@@ -15,9 +15,8 @@ bar {
   }
 }
 
-font pango:Liberation Mono 8
+font pango:Liberation Mono 11
 
 set $mod Mod1
 
 output DP-1 background ~/Pictures/background.png center
-output DP-1 scale 2

diff --git a/states/sway/files/rhenium b/states/sway/files/rhenium
index c8291cfdc3fe89500d4d5cc0665d33745225bd0d..1cd7f3af6c0e5760682dbeb65879cc8026313be3 100644 (file)
--- a/states/sway/files/rhenium
+++ b/states/sway/files/rhenium
@@ -29,11 +29,5 @@ output HDMI-A-2 {
        background ~/Pictures/background_1440.png fill
 }
 
-input * {
-  xkb_layout gb
-  xkb_variant colemak
-  xkb_options ctrl:nocaps
-}
-
 # Disable tap-to-click on touchpad to prevent jerkyness
 input type:touch tap disable

diff --git a/states/termite/files/config b/states/termite/files/config
index cc7d5abf9c9a73b54acd171e831a336201913396..c81a2ff203358104164f23cd312978445df03f06 100644 (file)
--- a/states/termite/files/config
+++ b/states/termite/files/config
@@ -1,5 +1,7 @@
-{% if grains['host'] in ['dubnium', ] %}
-       {% set font_size = 9 %}
+{% if grains['host'] in ['rhenium', ] %}
+       {% set font_size = 10 %}
+{% elif grains['host'] in ['dubnium', ] %}
+       {% set font_size = 13 %}
 {% else %}
        {% set font_size = 11 %}
 {% endif %}