X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=states%2Fsway%2Ffiles%2Fconfig.jinja;h=e474512d580cbfecf26a1cacac89eeea83c7ca18;hb=c1452af9527bef770b5acb100359bfc1668ec552;hp=786fb699967f2f06934c81f42ac38182188e7004;hpb=0dd88a896dd0af0ab1904be4ecee011fd638b833;p=max%2Fsaltfiles.git

diff --git a/states/sway/files/config.jinja b/states/sway/files/config.jinja
index 786fb69..e474512 100644
--- a/states/sway/files/config.jinja
+++ b/states/sway/files/config.jinja
@@ -104,9 +104,9 @@ mode "$ratpoison" {
     bindsym c exec 'swaymsg mode "default"; swaymsg exec termite'
     bindsym q exec 'swaymsg mode "default"; swaymsg kill'
 
-    bindsym Shift+e exec 'swaymsg mode "default"; swaymsg exec dmenu_run'
+    bindsym Shift+e exec 'swaymsg mode "default"; swaymsg exec bemenu-run'
 
-    bindsym $mod+l exec 'swaymsg mode "default"; "lock.{{ host }}"' 
+    bindsym $mod+l exec 'swaymsg mode "default"; "lock.nosmartcard"' 
     bindsym Escape mode "default"
 }
 
@@ -188,60 +188,6 @@ exec swayidle \
     resume 'swaymsg "output * dpms on" \
   before-sleep "lock.{{ host }}"
 
-# Magnesium specific section
-{% if host == 'magnesium' %}
-bar {
-  id bar_left
-  status_command conky-i3bar
-  position top
-  output "HDMI-A-3"
-  font pango:Liberation Mono 10
-  colors {
-    background $black_super
-    focused_background $black
-    focused_workspace $black_super $yellow_super $black
-    active_workspace $black_super $blue_super $black
-    inactive_workspace $black_super $black_super $white_super
-    urgent_workspace $black $red_super $white
-  }
-}
-
-bar {
-  id bar_right
-  position top
-  output "HDMI-A-2"
-  font pango:Liberation Mono 10
-  colors {
-    background $black_super
-    focused_background $black
-    focused_workspace $black_super $yellow_super $black
-    active_workspace $black_super $blue_super $black
-    inactive_workspace $black_super $black_super $white_super
-    urgent_workspace $black $red_super $white
-  }
-}
-
-
-workspace 1 output HDMI-A-3
-workspace 2 output HDMI-A-2
-
-output HDMI-A-2 {
-  position 0 1080
-  background ~/Pictures/background_1080_1.png fit
-}
-
-output HDMI-A-3 {
-  position 0 0
-  background ~/Pictures/background_1080_2.png fit
-}
-
-
-
-font pango:Liberation Mono 8
-
-input 1241:36:HOLDCHIP_USB_Keyboard {
-  xkb_layout us
-  xkb_variant colemak
-  xkb_options ctrl:nocaps
-}
-{% endif %}
+# host specific section
+{%- do salt.log.error('sway/files/' + host) -%}
+{% include 'sway/files/' + host %}