Make some changes for dubnium

diff --git a/states/i3/files/config.jinja b/states/i3/files/config.jinja
index a5e95fc9fb2bddbc66ed22ff05bf014a0719653e..d35f003779b4dcae4e82ad29095caf81d58a3316 100644 (file)
--- a/states/i3/files/config.jinja
+++ b/states/i3/files/config.jinja
@@ -278,7 +278,7 @@ exec "zoom"
 bar {
   id bar_left
   position top
-  output "DVI-D-1"
+  output "DVI-D-0"
   font pango:Liberation Mono 12
   colors {
     background $black_super
@@ -295,7 +295,7 @@ bar {
   id bar_right
   status_command ~/.local/bin/conky-i3bar
   position top
-  output "DP-1"
+  output "DP-2"
   font pango:Liberation Mono 12
   colors {
     background $black_super

diff --git a/states/i3/files/layout-qwerty_us b/states/i3/files/layout-qwerty_us
new file mode 100644 (file)
index 0000000..756f428
--- /dev/null
+++ b/states/i3/files/layout-qwerty_us
@@ -0,0 +1,2 @@
+#!/bin/sh
+setxkbmap us

diff --git a/states/i3/init.sls b/states/i3/init.sls
index c9f0b4694b30680551242646d121c3acdf2b385b..71318218db6ab104bdc317a2bc1baf7fdbec29ea 100644 (file)
--- a/states/i3/init.sls
+++ b/states/i3/init.sls
@@ -54,6 +54,14 @@ layout colemak us:
     - group: {{ grains['user'] }}
     - mode: 750
 
+layout us:
+  file.managed:
+    - name: {{ grains['homedir'] }}/.local/bin/layout-qwerty_us
+    - source: salt://i3/files/layout-qwerty_us
+    - user: {{ grains['user'] }}
+    - group: {{ grains['user'] }}
+    - mode: 750
+
 xprofile config:
   file.managed:
     - name: {{ grains['homedir'] }}/.xprofile