[sway] minor changes to sync wit x86 sway community edition

overlays/sway/etc/skel/.config/sway/config

@@ -7,14 +7,8 @@
 # global variables
 include /etc/sway/definitions
 
-# add your customizations here
-# e.g.:
-# * change modifier key from Alt to Win/Pine-Key: set $mod Mod4
-# * change the background image: set $background /usr/share/wallpapers/manjaro-arm/generic/manjaro-arm.png
-# * change the theme: set $theme /etc/sway/themes/matcha-blue
-#
-# please note that the theme has a custom background spec as well, so you will have to keep the right
-# order if you want to change both (first theme, then background)
+# user config
+include ~/.config/sway/config.d/*
 
 include /etc/sway/inputs/*
 include /etc/sway/outputs/*

overlays/sway/etc/skel/.config/sway/config.d/00-user.conf

+# add your customizations here
+# e.g.:
+# * change modifier key from Win/Pine-Key to Alt: set $mod Mod1
+# * change the background image: set $background /usr/share/wallpapers/manjaro-nudes.png
+# * change the theme: set $theme /etc/sway/themes/matcha-blue
+#
\ No newline at end of file

overlays/sway/etc/skel/.config/waybar/config

@@ -33,6 +33,8 @@
         "backlight",
         "idle_inhibitor",
         "pulseaudio",
+        "bluetooth",
+        "custom/pacman",
         "tray",
         "clock"
     ],
@@ -74,7 +76,8 @@
         "states": {
             "warning": 70,
             "critical": 90
-        }
+        },
+        "on-click": "swaymsg exec \\$term_float htop"
     },
 
     "memory": {
@@ -83,16 +86,17 @@
         "states": {
             "warning": 70,
             "critical": 90
-        }
+        },
+        "on-click": "swaymsg exec \\$term_float htop"
     },
 
     "network": {
         "interval": 5,
         "format-wifi": "  {essid} ({signalStrength}%)", // Icon: wifi
-        "format-ethernet": "  {ifname}: {ipaddr}/{cidr}", // Icon: ethernet
+        "format-ethernet": "  {ifname}", // Icon: ethernet
         "format-disconnected": "⚠  Disconnected",
         "tooltip-format": "{ifname}: {ipaddr}",
-        "on-click": "nm-connection-editor"
+        "on-click": "swaymsg exec \\$term_float nmtui"
     },
 
     "sway/mode": {
@@ -160,5 +164,24 @@
     "tray": {
         "icon-size": 21,
         "spacing": 5
+    },
+
+    "custom/pacman": {
+        "format": "  {}",
+        "interval": 3600,
+        "exec-if": "[ $(checkupdates | wc -l) -gt 0 ]",
+        "exec": "checkupdates | wc -l",
+        "on-click": "pamac-manager && pamac checkupdates -a -q | wc -l",
+    },
+
+    "bluetooth": {
+        "format": "{icon}",
+        "interval": 30,
+        "format-icons": {
+            "enabled": "",
+            "disabled": ""
+        },
+        "on-click": "blueman-manager",
+        "tooltip-format": "{status}"
     }
 }

overlays/sway/etc/skel/.config/waybar/style.css

@@ -68,6 +68,9 @@
 #pulseaudio,
 #temperature,
 #idle_inhibitor,
+#bluetooth,
+#backlight,
+#custom-pacman,
 #tray {
     padding-left: 10px;
     padding-right: 10px;
@@ -143,6 +146,7 @@
 }
 
 #network.disconnected {
+    margin-top: 6px;
     color: @warning_color;
 }
 
@@ -193,3 +197,11 @@
     border-color: @error_color;
     color: @error_color;
 }
+
+#custom-pacman {
+    color: @warning_color;
+}
+
+#bluetooth.disabled {
+    color: @warning_color;
+}

overlays/sway/etc/sway/config.d/98-application-defaults

@@ -7,4 +7,4 @@ for_window [app_id="nm-connection-editor"] floating enable
 for_window [title="File Operation Progress"] floating enable
 for_window [app_id="firefox" title="Library"] floating enable
 for_window [app_id="thunderbird" title=".*Reminder"] floating enable
-
+for_window [app_id="floating_shell"] floating enable, border pixel 1, sticky enable

overlays/sway/etc/sway/config.d/99-autostart-applications

@@ -4,8 +4,8 @@ exec $idle
 # autostart background applications
 exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
 exec --no-startup-id mako
-exec --no-startup-id pamac-tray-appindicator
-exec --no-startup-id nm-applet --indicator
-exec --no-startup-id blueman-applet
+# exec --no-startup-id pamac-tray-appindicator
+# exec --no-startup-id nm-applet --indicator
+# exec --no-startup-id blueman-applet
 exec --no-startup-id mntray
 exec --no-startup-id $help --autostart

overlays/sway/etc/sway/definitions

 ### Variables
 #
-# Logo key. Use Mod1 for Alt.
+# Logo key. Use Mod1 for Alt and Mod4 for Super.
 set $mod Mod1
 
 # Home row direction keys, like vim
@@ -14,6 +14,7 @@ set $theme /etc/sway/themes/matcha-green
 
 # Your preferred terminal emulator
 set $term termite --config=$theme/termite
+set $term_float $term --name=floating_shell --exec
 
 # Your preferred application launcher
 # Note: pass the final command to swaymsg so that the resulting window can be opened
@@ -23,16 +24,25 @@ set $menu wofi --show run --exec-search --prompt "Run Command" --term $term | xa
 set $selwin sws.sh --dmenu-cmd "wofi --show dmenu" --format "%W | %A - %T"
 set $help swhelp.sh --conf $HOME/.config/wofi/swhelp --location 7 --xoffset 15 --yoffset -30
 
+### Lockscreen configuration
+#
+set $locking exec swaylock -c "$base01" -F \
+    --inside-color "$base01" \
+    --ring-color "$base02" \
+    --ring-ver-color "$base0D" \
+    --ring-clear-color "$base0B" \
+    --inside-clear-color "$base07"
+
 ### Idle configuration
 # This will lock your screen after 300 seconds of inactivity, then turn off
 # your displays after another 300 seconds, and turn your screens back on when
 # resumed. It will also lock your screen before your computer goes to sleep.
 #
 set $idle swayidle -w \
-    timeout 300 'swaylock -f -c 000000' \
+    timeout 300 'exec $locking' \
     timeout 600 'swaymsg "output * dpms off"' \
     resume 'swaymsg "output * dpms on"' \
-    before-sleep 'swaylock -f -c 000000'
+    before-sleep 'exec $locking'
 
 # statusbar command
 set $statusbar waybar