[sway] update swaylock to fit theme colors

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

@@ -50,7 +50,7 @@
             "warning": 30,
             "critical": 15
         },
-        "format-charging": "  {icon}  {capacity}%", // Icon: bolt
+        "format-charging": " {icon} {capacity}%", // Icon: bolt
         "format": "{icon}  {capacity}%",
         "format-icons": [
             "", // Icon: battery-empty
@@ -72,7 +72,7 @@
 
     "cpu": {
         "interval": 5,
-        "format": "  {usage}%", // Icon: microchip
+        "format": " {usage}%", // Icon: microchip
         "states": {
             "warning": 70,
             "critical": 90
@@ -82,7 +82,7 @@
 
     "memory": {
         "interval": 5,
-        "format": "  {}%", // Icon: memory
+        "format": " {}%", // Icon: memory
         "states": {
             "warning": 70,
             "critical": 90
@@ -92,8 +92,8 @@
 
     "network": {
         "interval": 5,
-        "format-wifi": "  {essid} ({signalStrength}%)", // Icon: wifi
-        "format-ethernet": "  {ifname}", // Icon: ethernet
+        "format-wifi": " {essid} ({signalStrength}%)", // Icon: wifi
+        "format-ethernet": " {ifname}", // Icon: ethernet
         "format-disconnected": "⚠  Disconnected",
         "tooltip-format": "{ifname}: {ipaddr}",
         "on-click": "swaymsg exec \\$term_float nmtui"
@@ -132,8 +132,8 @@
 
     "pulseaudio": {
         //"scroll-step": 1,
-        "format": "{icon}  {volume}%    {format_source}",
-        "format-bluetooth": "{icon}  {volume}%",
+        "format": "{icon} {volume}%   {format_source}",
+        "format-bluetooth": "{icon} {volume}%",
         "format-muted": "",
         "format-icons": {
             "headphones": "",
@@ -150,7 +150,7 @@
     "temperature": {
       "critical-threshold": 80,
       "interval": 5,
-      "format": "{icon}  {temperatureC}°C",
+      "format": "{icon} {temperatureC}°C",
       "format-icons": [
           "", // Icon: temperature-empty
           "", // Icon: temperature-quarter
@@ -167,7 +167,7 @@
     },
 
     "custom/pacman": {
-        "format": "  {}",
+        "format": " {}",
         "interval": 3600,
         "exec-if": "[ $(checkupdates | wc -l) -gt 0 ]",
         "exec": "pamac checkupdates | wc -l",

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

@@ -55,7 +55,7 @@
     background: @background_color;
     color: @text_color;
     font-family: "TerminessTTF Nerd Font", sans-serif;
-    font-size: 16px;
+    font-size: 14px;
 }
 
 /* Each module */

overlays/sway/etc/sway/definitions

@@ -26,12 +26,7 @@ set $help swhelp.sh --conf $HOME/.config/wofi/swhelp --location 7 --xoffset 15 -
 
 ### 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"
+set $locking swaylock --daemonize --config $theme/swaylock
 
 ### Idle configuration
 # This will lock your screen after 300 seconds of inactivity, then turn off

overlays/sway/etc/sway/themes/matcha-blue/definitions

@@ -39,4 +39,4 @@ client.urgent           $base08 $base08 $base00 $base08 $base08
 client.placeholder      $base00 $base00 $base05 $base00 $base00
 client.background       $base07
 
-set $theme_template_script "s/GTK_THEME/$gtk-theme/g; s/ICON_THEME/$icon-theme/g; s/CURSOR_THEME/$cursor-theme/g; s/GUI_FONT/$gui-font/g; s/KVANTUM_THEME/$kvantum-theme/g; s/BACKGROUND_COLOR/$base00/g; s/ACCENT_COLOR/$base0D/g;"
+set $theme_template_script "s/GTK_THEME/$gtk-theme/g; s/ICON_THEME/$icon-theme/g; s/CURSOR_THEME/$cursor-theme/g; s/GUI_FONT/$gui-font/g; s/KVANTUM_THEME/$kvantum-theme/g; s/BACKGROUND_COLOR/$base00/g; s/ACCENT_COLOR/$base0D/g; s/TEXT_COLOR/$base06/g; s/TERM_FONT/$term-font/g;"

overlays/sway/etc/sway/themes/matcha-blue/swaylock

+color=#282a2b
+inside-color=#282a2b
+inside-clear-color=#eeeeee
+ring-color=#3B758C
+ring-ver-color=#55b5db
+ring-clear-color=#9fca56
+ignore-empty-password
+show-failed-attempts

overlays/sway/etc/sway/themes/matcha-green/definitions

@@ -39,4 +39,4 @@ client.urgent           $base08 $base08 $base00 $base08 $base08
 client.placeholder      $base00 $base00 $base05 $base00 $base00
 client.background       $base07
 
-set $theme_template_script "s/GTK_THEME/$gtk-theme/g; s/ICON_THEME/$icon-theme/g; s/CURSOR_THEME/$cursor-theme/g; s/GUI_FONT/$gui-font/g; s/KVANTUM_THEME/$kvantum-theme/g; s/BACKGROUND_COLOR/$base00/g; s/ACCENT_COLOR/$base0C/g;"
+set $theme_template_script "s/GTK_THEME/$gtk-theme/g; s/ICON_THEME/$icon-theme/g; s/CURSOR_THEME/$cursor-theme/g; s/GUI_FONT/$gui-font/g; s/KVANTUM_THEME/$kvantum-theme/g; s/BACKGROUND_COLOR/$base00/g; s/ACCENT_COLOR/$base0C/g; s/TEXT_COLOR/$base06/g; s/TERM_FONT/$term-font/g;"

overlays/sway/etc/sway/themes/matcha-green/swaylock

+color=#282a2b
+inside-color=#282a2b
+inside-clear-color=#eeeeee
+ring-color=#3B758C
+ring-ver-color=#55b5db
+ring-clear-color=#9fca56
+ignore-empty-password
+show-failed-attempts

overlays/sway/etc/sway/themes/templates/mako

@@ -3,10 +3,10 @@
 layer=overlay
 width=400
 height=200
-font="GUI_FONT"
+font=TERM_FONT
 border-size=3
 border-color=ACCENT_COLOR
-text-color=#FFFFFF
+text-color=TEXT_COLOR
 background-color=BACKGROUND_COLOR
 icons=1
 max-icon-size=48