From 52844192b7dda3b90836ba52b4e19af482145151 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Tue, 14 Jul 2020 15:08:13 +0200
Subject: [PATCH] Update sway config

---
 config/sway/config.m4 | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/config/sway/config.m4 b/config/sway/config.m4
index 2ee8678..82a9d6d 100644
--- a/config/sway/config.m4
+++ b/config/sway/config.m4
@@ -9,9 +9,9 @@ define([_forloop],
 
 set $mod Mod4
 
-font pango:monospace 7
+font pango:monospace 8
 
-new_window none
+default_border none
 hide_edge_borders both
 
 focus_on_window_activation urgent
@@ -58,11 +58,8 @@ forloop([i], 1,9, [
 ])
 
 # reload the configuration file
-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+c reload
+bindsym $mod+Shift+r exec bash -c "sleep 1; swaymsg reload"
 
 # TODO
 # ifelse(hostname, [petalius], [
@@ -119,10 +116,10 @@ bindsym $mod+m mode "moveit"
 define([defcolor], [define(base$1, ["[#]$2"])])
 include([base16.m4])
 
-# client.focused base0D base0D base00 base01
-# client.focused_inactive base02 base02 base03 base01
-# client.unfocused base01 base01 base03 base01
-# client.urgent base02 base08 base07 base08
+client.focused base0D base0D base00 base01
+client.focused_inactive base02 base02 base03 base01
+client.unfocused base01 base01 base03 base01
+client.urgent base02 base08 base07 base08
 
 # Start i3bar to display a workspace bar (plus the system information i3status
 # finds out, if available)
@@ -131,6 +128,8 @@ bar {
     font pango:DejaVu Sans, Noto Sans CJK JP 8
     icon_theme Adwaita
 
+    tray_output *
+
     colors {
         separator base03
         background base01
@@ -143,6 +142,7 @@ bar {
 }
 
 exec --no-startup-id mako
+exec --no-startup-id gsd-xsettings
 # exec --no-startup-id nm-applet
 # exec --no-startup-id pa-applet
 # exec --no-startup-id blueman-applet
@@ -154,7 +154,7 @@ exec swayidle -w \
               resume 'swaymsg "output * dpms on"' \
          before-sleep /home/gebner/etc/swaylock.sh
 
-output * bg gray solid_color
+output * bg "#aaaaaa" solid_color
 output * bg /home/gebner/Desktop/background.png fill
 
 input * xkb_layout us
@@ -166,16 +166,16 @@ seat * hide_cursor 1200
 # fcitx cannot capture super+space
 bindsym $mod+Space exec fcitx-remote -t
 
-ifelse(hostname, [theba], [
-  workspace 1 output eDP1
-  workspace 9 output DP2    # VGA
+ifelse(hostname, [archachatina], [
+  output DP-3 pos 0 0 res 3840x2160
+  output DP-4 pos 3840 0 res 2560x1440 transform 270
+  output HDMI-A-4 pos 455 2758
+  output DP-5 pos 2733 2758
+
+  workspace 8 output DP-5
+  workspace 9 output HDMI-A-4
 ])
 
-# TODO
-ifelse(hostname, [archachatina], [
-output DP-1 pos 0 0
-output DP-2 transform 270
-])
 ifelse(hostname, [decoysnail], [
 # exec --no-startup-id ~/.screenlayout/desk.sh
 ])