small UI/UX improvements taken over from Sway desktop edition

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

@@ -8,7 +8,7 @@
 include /etc/sway/definitions
 
 # user config
-include ~/.config/sway/config.d/*
+include $HOME/.config/sway/config.d/*
 
 include /etc/sway/inputs/*
 include /etc/sway/outputs/*

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

@@ -51,7 +51,7 @@
             "critical": 15
         },
         "format-charging": " {icon} {capacity}%", // Icon: bolt
-        "format": "{icon}  {capacity}%",
+        "format": "{icon} {capacity}%",
         "format-icons": [
             "", // Icon: battery-empty
             "", // Icon: battery-quarter
@@ -66,7 +66,7 @@
 
     "clock": {
         "interval": 60,
-        "format": "  {:%e %b %Y %H:%M}", // Icon: calendar-alt
+        "format": " {:%e %b %Y %H:%M}", // Icon: calendar-alt
         "tooltip": true,
         "tooltip-format": "<big>{:%B %Y}</big>\n<tt>{calendar}</tt>"
     },
@@ -95,7 +95,7 @@
         "interval": 5,
         "format-wifi": " {essid} ({signalStrength}%)", // Icon: wifi
         "format-ethernet": " {ifname}", // Icon: ethernet
-        "format-disconnected": "⚠  Disconnected",
+        "format-disconnected": "⚠ Disconnected",
         "tooltip-format": "{ifname}: {ipaddr}",
         "on-click": "swaymsg exec \\$term_float_portrait nmtui"
     },
@@ -149,7 +149,7 @@
     },
 
     "temperature": {
-      "critical-threshold": 80,
+      "critical-threshold": 90,
       "interval": 5,
       "format": "{icon} {temperatureC}°C",
       "format-icons": [
@@ -172,7 +172,7 @@
         "interval": 3600,
         "exec-if": "[ $(checkupdates | wc -l) -gt 0 ]",
         "exec": "pamac checkupdates | wc -l",
-        "on-click": "pamac-manager --updates && pamac checkupdates -a -q | wc -l",
+        "on-click": "pamac-manager --updates",
     },
 
     "bluetooth": {

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

@@ -156,6 +156,7 @@
 
 #pulseaudio.muted {
     /* No styles */
+    color: @warning_color;
 }
 
 #temperature {
@@ -172,6 +173,8 @@
 
 #window {
     font-weight: bold;
+    margin-right: 25px;
+    color: @accent_color;
 }
 
 #workspaces button {
@@ -180,13 +183,15 @@
     padding-bottom: 2px;
     padding-left: 10px;
     padding-right: 10px;
-    color: @dim_text_color;
+    color: @accent_color;
+    font-weight: bold;
 }
 
 #workspaces button.focused {
     border-color: @accent_color;
     color: @text_color;
     background-color: @accent_color;
+    font-weight: bold;
 }
 
 #workspaces button.urgent {

overlays/sway/etc/skel/.config/wlogout/layout

 {
     "label" : "lock",
-    "action" : "swaylock -f -c 000000",
+    "action" : "swaymsg exec '$locking'",
     "text" : "Lock",
     "keybind" : "l"
 }

overlays/sway/etc/sway/definitions

@@ -35,6 +35,7 @@ set $locking swaylock --daemonize --config $theme/swaylock
 # resumed. It will also lock your screen before your computer goes to sleep.
 #
 set $idle swayidle -w \
+    timeout 240 'light -G > /tmp/brightness && light -S 10' resume 'light -S $([ -f /tmp/brightness ] && cat /tmp/brightness || echo 100%)' \
     timeout 300 'exec $locking' \
     timeout 600 'swaymsg "output * dpms off"' \
     resume 'swaymsg "output * dpms on"' \

overlays/sway/etc/sway/modes/default

@@ -2,17 +2,18 @@
 #
 # Basics:
 #
-# Start a terminal
+## Launch // Terminal ##
 bindsym $mod+Return exec $term
 
-# Kill focused window
+## Action // Kill focused window ##
 bindsym $mod+Shift+q kill
 
-# Start your launcher
+## Launch // Application Launcher ##
 bindsym $mod+d exec $appmenu
+## Launch // Command Runner ##
 bindsym $mod+Shift+d exec $menu
+## Launch // Window Switcher ##
 bindsym $mod+Ctrl+d exec $selwin
-bindsym $mod+question exec $help
 
 # Drag floating windows by holding down $mod and left mouse button.
 # Resize them with right mouse button + $mod.
@@ -21,43 +22,52 @@ bindsym $mod+question exec $help
 # mouse button for dragging.
 floating_modifier $mod normal
 
-# Reload the configuration file
+## Action // Reload Sway Configuration ##
 bindsym $mod+Shift+c reload
 
-# Exit sway (logs you out of your Wayland session)
+## Launch // Exit Menu ##
 bindsym $mod+Shift+e exec $shutdown
 
-# Media key bindings
+## Action // Increase volume of Master ##
+bindsym XF86AudioRaiseVolume exec amixer -q sset 'Master' 5%+
+
+## Action // Decrease volume of Master ##
 bindsym XF86AudioLowerVolume exec amixer -q sset 'Master' 5%-
+
+## Action // Mute volume of Master ##
 bindsym XF86AudioMute exec amixer -q sset 'Master' toggle
-bindsym XF86AudioRaiseVolume exec amixer -q sset 'Master' 5%+
 
-# Screen brightness bindings
-bindsym XF86MonBrightnessDown exec light -U 5
+## Action // Increase brightness ##
 bindsym XF86MonBrightnessUp exec light -A 5
 
-# capture PowerOff key
+## Action // Decrease brightness ##
+bindsym XF86MonBrightnessDown exec light -U 5
+
+## Action // Show shutdown dialog on PowerOff key ##
 bindsym XF86PowerOff exec $shutdown
 
 #
 # Moving around:
 #
 # Move your focus around
+## Navigation // Move focus // $mod + ↑ ↓ ← → ##
 bindsym $mod+$left focus left
 bindsym $mod+$down focus down
 bindsym $mod+$up focus up
 bindsym $mod+$right focus right
+
 # Or use $mod+[up|down|left|right]
 bindsym $mod+Left focus left
 bindsym $mod+Down focus down
 bindsym $mod+Up focus up
 bindsym $mod+Right focus right
 
-# Move the focused window with the same, but add Shift
+## Navigation // Move focussed window // $mod + Shift + ↑ ↓ ← → ##
 bindsym $mod+Shift+$left move left
 bindsym $mod+Shift+$down move down
 bindsym $mod+Shift+$up move up
 bindsym $mod+Shift+$right move right
+
 # Ditto, with arrow keys
 bindsym $mod+Shift+Left move left
 bindsym $mod+Shift+Down move down
@@ -67,7 +77,7 @@ bindsym $mod+Shift+Right move right
 #
 # Workspaces:
 #
-# Switch to workspace
+## Navigation // Switch workspace // $mod + [number] ##
 bindsym $mod+1 workspace 1
 bindsym $mod+2 workspace 2
 bindsym $mod+3 workspace 3
@@ -78,7 +88,7 @@ bindsym $mod+7 workspace 7
 bindsym $mod+8 workspace 8
 bindsym $mod+9 workspace 9
 bindsym $mod+0 workspace 10
-# Move focused container to workspace
+## Action // Move focussed window to workspace // $mod + Shift + [number] ##
 bindsym $mod+Shift+1 move container to workspace 1
 bindsym $mod+Shift+2 move container to workspace 2
 bindsym $mod+Shift+3 move container to workspace 3
@@ -95,29 +105,33 @@ bindsym $mod+Shift+0 move container to workspace 10
 #
 # Layout stuff:
 #
-# You can "split" the current object of your focus with
-# $mod+b or $mod+v, for horizontal and vertical splits
-# respectively.
+## Setting // Split windows horizontally ##
 bindsym $mod+b splith
+## Setting // Split windows vertically ##
 bindsym $mod+v splitv
 
-# Switch the current container between different layout styles
+## Action // Switch to window stacking ##
 bindsym $mod+s layout stacking
+## Action // Switch to window tabbing ##
 bindsym $mod+w layout tabbed
+## Action // Toggle window splitting ##
 bindsym $mod+e layout toggle split
 
-# Make the current focus fullscreen
+## Action // Toggle fullscreen ##
 bindsym $mod+f fullscreen
 
-# Toggle the current focus between tiling and floating mode
+## Action // Toggle floating ##
 bindsym $mod+Shift+space floating toggle
 
-# Swap focus between the tiling area and the floating area
+## Navigation // Swap focus between the tiling area and the floating area ##
 bindsym $mod+space focus mode_toggle
 
-# Move focus to the parent container
+## Navigation // Swap focus to the parent window ##
 bindsym $mod+a focus parent
 
+## Launch // Help ##
+bindsym $mod+question exec $help
+
 default_border pixel 1
 hide_edge_borders smart
 

overlays/sway/etc/sway/modes/recording

@@ -28,5 +28,7 @@ mode --pango_markup $mode_recording {
     bindsym Escape mode "default"
     bindsym Return mode "default"
 }
+
+## Launch // Recording Mode ##
 bindsym $mod+Shift+r mode $mode_recording
 

overlays/sway/etc/sway/modes/resize

@@ -37,4 +37,5 @@ mode --pango_markup $mode_resize {
     bindsym Return mode "default"
     bindsym Escape mode "default"
 }
+## Launch // Resize Mode ##
 bindsym $mod+r mode $mode_resize

overlays/sway/etc/sway/modes/scratchpad

@@ -4,9 +4,9 @@
 # Sway has a "scratchpad", which is a bag of holding for windows.
 # You can send windows there and get them back later.
 
-# Move the currently focused window to the scratchpad
+## Action // Move the currently focused window to the scratchpad ##
 bindsym $mod+Shift+minus move scratchpad
 
-# Show the next scratchpad window or hide the focused scratchpad window.
 # If there are multiple scratchpad windows, this command cycles through them.
+## Action // Show the next scratchpad window or hide the focused scratchpad window. ##
 bindsym $mod+minus scratchpad show

overlays/sway/etc/sway/modes/screenshot

@@ -17,4 +17,6 @@ mode --pango_markup $mode_screenshot {
     bindsym Escape mode "default"
     bindsym Return mode "default"
 }
+
+## Launch // Screenshot Mode ##
 bindsym $mod+Shift+s mode $mode_screenshot

overlays/sway/etc/sway/outputs/default-screen

@@ -9,5 +9,5 @@
 # import theme
 include $theme/definitions
 
-# Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/)
+# Default wallpaper
 output * bg $background fill