Fix dpi scaling

diff --git a/states/i3/files/Xresources.jinja b/states/i3/files/Xresources.jinja
new file mode 100644 (file)
index 0000000..2f1be4f
--- /dev/null
+++ b/states/i3/files/Xresources.jinja
@@ -0,0 +1,5 @@
+{% set host = grains['host'] %}
+
+{% if host == "dubnium" or host == "barium"  %}
+Xft.dpi: 108
+{% endif %}

diff --git a/states/i3/files/xprofile.jinja b/states/i3/files/xprofile.jinja
index 41bacf2e61d96be73e96e816d9b70f1a63df9ada..8b812684833f29812c9d5e2712a85ba18085a906 100755 (executable)
--- a/states/i3/files/xprofile.jinja
+++ b/states/i3/files/xprofile.jinja
@@ -1,9 +1,6 @@
 #!/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

diff --git a/states/i3/init.sls b/states/i3/init.sls
index 71318218db6ab104bdc317a2bc1baf7fdbec29ea..4203064b2706bb0274a8fed49f712e344b3e1394 100644 (file)
--- a/states/i3/init.sls
+++ b/states/i3/init.sls
@@ -79,3 +79,12 @@ xinitrc config:
     - user: {{ grains['user']}}
     - group: {{ grains['user']}}
     - mode: 640
+
+Xresources config:
+  file.managed:
+    - name: {{ grains['homedir'] }}/.Xresources
+    - source: salt://i3/files/Xresources.jinja
+    - template: jinja
+    - user: {{ grains['user']}}
+    - group: {{ grains['user']}}
+    - mode: 640