From b82bec612de785467e8f2c69d36ac2fe62a0cb0c Mon Sep 17 00:00:00 2001
From: Fabian Becker <Fabian Becker>
Date: Fri, 29 Jul 2022 16:44:17 +0200
Subject: [PATCH] Move from i3 to sway

---
 .config/{i3 => sway}/config           | 28 +++++----------------------
 .config/sway/config.d/inputs          |  3 +++
 .config/{i3 => sway}/config.d/outputs |  2 ++
 .config/{i3 => sway}/status.sh        |  0
 4 files changed, 10 insertions(+), 23 deletions(-)
 rename .config/{i3 => sway}/config (84%)
 create mode 100644 .config/sway/config.d/inputs
 rename .config/{i3 => sway}/config.d/outputs (54%)
 rename .config/{i3 => sway}/status.sh (100%)

diff --git a/.config/i3/config b/.config/sway/config
similarity index 84%
rename from .config/i3/config
rename to .config/sway/config
index fb5db83..40866cb 100644
--- a/.config/i3/config
+++ b/.config/sway/config
@@ -28,21 +28,13 @@ floating_modifier $mod
 
 # start a terminal
 # bindsym $mod+Return exec i3-sensible-terminal
-bindsym $mod+Return exec xterm 
+bindsym $mod+Return exec alacritty 
 
 # kill focused window
-# bindsym $mod+space exec "/home/theprimeagen/dotfiles/awesome-streamerrc/ThePrimeagen/tmux2"
-
 bindsym $mod+Shift+q kill
 
-# start dmenu (a program launcher)
-# bindsym $mod+d exec --no-startup-id i3-dmenu-desktop
-bindsym $mod+d exec --no-startup-id wofi --show run --gtk-dark
-
-# There also is the (new) i3-dmenu-desktop which only displays applications
-# shipping a .desktop file. It is a wrapper around dmenu, so you need that
-# installed.
-# bindsym $mod+d exec --no-startup-id i3-dmenu-desktop
+# app launcher
+bindsym $mod+d exec wofi --show=run --gtk-dark
 
 # change focus
 bindsym $mod+h focus left
@@ -120,7 +112,7 @@ bindsym $mod+Shift+c reload
 # restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
 bindsym $mod+Shift+r restart
 # exit i3 (logs you out of your X session)
-bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
+# bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
 
 # resize window (you can also use the mouse for that)
 mode "resize" {
@@ -152,18 +144,8 @@ bindsym $mod+r mode "resize"
 # finds out, if available)
 set $status_script ~/.config/sway/status.sh
 
-bar {
-        status_command while $status_script; do sleep 1; done
-        position top
-	colors {
-		statusline #ffffff
-
-		background #323232
-	}
-	font pango:DejaVu Sans Mono 14
-}
-
 # Suspend
 bindsym $mod+Shift+period exec systemctl suspend
 
 include ~/.config/sway/config.d/*
+include /etc/sway/config.d/*
diff --git a/.config/sway/config.d/inputs b/.config/sway/config.d/inputs
new file mode 100644
index 0000000..7cd4c66
--- /dev/null
+++ b/.config/sway/config.d/inputs
@@ -0,0 +1,3 @@
+input 1452:591:Keychron_Keychron_K2 {
+    xkb_layout us
+}
diff --git a/.config/i3/config.d/outputs b/.config/sway/config.d/outputs
similarity index 54%
rename from .config/i3/config.d/outputs
rename to .config/sway/config.d/outputs
index fc5a270..b1af65c 100644
--- a/.config/i3/config.d/outputs
+++ b/.config/sway/config.d/outputs
@@ -1,5 +1,7 @@
 # Devices
 set $display_tv 'Technical Concepts Ltd TCL SMART TV 0x00001111'
+set $curved_small 'Goldstar Company Ltd LG HDR WQHD 0x0000655D'
 
 # Resolution
 output $display_tv mode 1920x1080@30Hz
+output $curved_small mode 3440x1440@60Hz
diff --git a/.config/i3/status.sh b/.config/sway/status.sh
similarity index 100%
rename from .config/i3/status.sh
rename to .config/sway/status.sh