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

diff --git a/states/conky/files/conkyrc b/states/conky/files/conkyrc
index 0dc0d102dcdafcc989d85a869d9960bee5de616f..83c03a9969fb91d99d172b822d04e63d89093ee7 100644 (file)
--- a/states/conky/files/conkyrc
+++ b/states/conky/files/conkyrc
@@ -6,6 +6,8 @@
        {% set ifdev = 'wlp2s0' %}
 {% elif grains['host'] == 'barium' %}
        {% set ifdev = 'enp3s0f1' %}
+{% elif grains['host'] == 'dubnium' %}
+       {% set ifdev = 'enp4s0' %}
 {% elif grains['host'] == 'rhenium' %}
        {% set ifdev = 'wlp2s0' %}
 {% else %}

diff --git a/states/sway/files/config.jinja b/states/sway/files/config.jinja
index 5dac6c7d320094034835f00da6deb3272d3100a8..4b7931ee2fd5a26c1ec6dd496ec3f531101d9b92 100644 (file)
--- a/states/sway/files/config.jinja
+++ b/states/sway/files/config.jinja
@@ -179,7 +179,8 @@ mode "resize" {
 
 bindsym $mod+p mode "resize"
 
-
+bindsym XF86MonBrightnessUp exec "brightnessctl set +100"
+bindsym XF86MonBrightnessDown exec "brightnessctl set 100-"
 
 hide_edge_borders both 
 
@@ -210,6 +211,10 @@ input 16700:8455:DELL_Dell_USB_Entry_Keyboard {
   xkb_variant colemak
   xkb_options ctrl:nocaps
 }
+
+input 7504:24616:unspecified_ErgoDox_ergonomic_keyboard {
+  xkb_layout gb
+}
 # host specific section
 {%- do salt.log.error('sway/files/' + host) -%}
 {% include 'sway/files/' + host %}

diff --git a/states/termite/files/config b/states/termite/files/config
index 97ccbae8cd701953e7ccaa1009a68118a70c826f..7d99708203023ae0c13d4811ebb94df359ff41f1 100644 (file)
--- a/states/termite/files/config
+++ b/states/termite/files/config
@@ -6,7 +6,7 @@
        {% set font_size = 11 %}
 {% endif %}
 
-{% if grains['host'] == 'barium' or grains['host'] == 'rhenium' %}
+{% if grains['host'] in ['barium', 'dubnium', 'rhenium'] %}
        {% set font_family = 'Source Code Pro' %}
 {% else %}
        {% set font_family = 'Source Code Pro for Powerline' %}