From 29cc8a08d12604b2c6611fe8c60ff79f950f6117 Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Sun, 21 Mar 2021 14:00:00 +0000
Subject: [PATCH] Make some changes for dubnium

---
 states/i3/files/config.jinja     | 4 ++--
 states/i3/files/layout-qwerty_us | 2 ++
 states/i3/init.sls               | 8 ++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 states/i3/files/layout-qwerty_us

diff --git a/states/i3/files/config.jinja b/states/i3/files/config.jinja
index a5e95fc..d35f003 100644
--- 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
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 c9f0b46..7131821 100644
--- 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
-- 
2.44.0