lots of sway-related changes

2 files changed, 62 insertions, 87 deletions

diff --git a/config/waybar/config b/config/waybar/config
index 4c6c17c..4f04b34 100644
--- a/config/waybar/config
+++ b/config/waybar/config
@@ -4,16 +4,9 @@
         "layer": "bottom",
         "position": "top",
         "height": 0,
-        "modules-left": ["sway/workspaces", "sway/mode", "sway/window"],
+        "modules-left": ["sway/workspaces", "sway/mode"],
         "modules-center": [],
-        "modules-right": ["tray", "network#wifi", "pulseaudio", "battery#bat1", "temperature", "clock#local"],
-        "idle_inhibitor": {
-            "format": "{icon}",
-            "format-icons": {
-                "activated": "",
-                "deactivated": ""
-            }
-        },
+        "modules-right": ["tray", "network#wifi", "pulseaudio", "battery#bat1", "temperature", "idle_inhibitor", "clock#local"],
         "sway/workspaces": {
             "format": "{icon}",
             "format-icons": {
@@ -28,85 +21,41 @@
             "format": "{:%a %d %b %I:%M %p}",
             "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>"
         },
-        "clock#utc": {
-            "interval": 1,
-            "format": "({:%H:%M %Z})",
-            "timezone": "UTC"
-        },
-        "cpu": {
-            "format": " {usage}%",
-            "tooltip": false
-        },
-        "disk": {
-            "format": " {}%",
-            "tooltip-format": "{used} / {total} used"
-        },
-        "memory": {
-            "format": " {}%",
-            "tooltip-format": "{used:0.1f}G / {total:0.1f}G used"
-        },
         "temperature": {
             "critical-threshold": 80,
             "format": "{icon} {temperatureC}°C",
             "format-icons": ["", "", "", "", ""]
         },
-        "backlight": {
-            "device": "intel_backlight",
-            "interval": 1,
-            "on-scroll-down": "brightlight -pd 1",
-            "on-scroll-up": "brightlight -pi 1",
-            "format": "{icon} {percent}%",
-            "format-icons": ["", "", ""]
-        },
         "battery#bat1": {
             "bat": "BAT0",
             "adapter": "AC",
-            "interval": 10,
+            "interval": 60,
             "states": {
-                "full": 100,
-                "good": 99,
-                "empty": 5
+                "5": 100,
+                "4": 80,
+                "3": 60,
+                "2": 40,
+                "1": 20,
+                "0": 5
             },
-            "format": "{icon}  {capacity}%",
-            "format-charging": " {capacity}%",
-            "format-plugged": " {capacity}%",
-            "format-empty": "",
-            "format-full": "",
-            "format-icons": ["", "", "", "", ""]
-        },
-        "network#disconnected": {
-            "tooltip-format": "No connection!",
-            "format-ethernet": "",
-            "format-wifi": "",
-            "format-linked": "",
-            "format-disconnected": "",
-            "on-click": "nm-connection-editor"
-        },
-        "network#ethernet": {
-            "interface": "enp*",
-            "format-ethernet": "",
-            "format-wifi": "",
-            "format-linked": "",
-            "format-disconnected": "",
-            "tooltip-format": "{ifname}: {ipaddr}/{cidr}",
-            "on-click": "nm-connection-editor"
+            "format": "{icon} {capacity}%",
+            "format-charging-5": " {capacity}%",
+            "format-charging-4": " {capacity}%",
+            "format-charging-3": " {capacity}%",
+            "format-charging-2": " {capacity}%",
+            "format-charging-1": " {capacity}%",
+            "format-charging-0": " {capacity}%",
+            "format-icons": ["", "", "", "", "", ""]
         },
         "network#wifi": {
             "interface": "wlp*",
             "format-ethernet": "",
-            "format-wifi": " {signalStrength}%",
+            "format-wifi": "  {signalStrength}%",
             "format-linked": "",
             "format-disconnected": "",
             "tooltip-format": "{essid}\n{ifname}: {ipaddr}/{cidr}",
             "on-click": "nm-connection-editor"
         },
-        "network#vpn": {
-            "interface": "tun0",
-            "format": "",
-            "format-disconnected": "",
-            "tooltip-format": "{ifname}: {ipaddr}/{cidr}",
-            "on-click": "nm-connection-editor"
-        },
         "pulseaudio": {
             "scroll-step": 1,
             "format": "{icon} {volume}%",
@@ -121,6 +70,13 @@
                 "default": ["奄", "奔", "墳"]
             },
             "on-click": "pavucontrol"
+        },
+        "idle_inhibitor": {
+            "format": "{icon}",
+            "format-icons": {
+                "activated": "",
+                "deactivated": ""
+            }
         }
     }
 ]
diff --git a/config/waybar/style.css b/config/waybar/style.css
index c88b6e7..6858337 100644
--- a/config/waybar/style.css
+++ b/config/waybar/style.css
@@ -1,39 +1,58 @@
 * {
-    font-family: JetBrainsMono Nerd Font;
+    border-radius: 0;
+    border: 0;
+    font-family: Noto Sans, JetBrainsMono Nerd Font;
     font-size: 11pt;
+    text-shadow: none;
 }
 
 window#waybar {
     background: #eff0f2;
     color: #4a4b4e;
+    border-bottom: 1px solid #dee2e0;
 }
 
-.topbar {
-    border-bottom: 1px solid #e2e4e1;
+tooltip {
+    background: alpha(#eff0f2, 0.95);
+    border: 1px solid #dee2e0;
+    border-radius: 5px;
 }
 
+tooltip label {
+    color: #4a4b4e;
+}
 
-#mode,
-#window,
-#network,
-#pulseaudio,
-#battery,
-#clock,
-#temperature {
+label {
     padding: 2px 10px;
     margin: 0;
 }
 
-#workspaces button,
-#workspaces button:hover,
-#workspaces button.focused,
-#workspaces button.urgent {
-    box-shadow: none;
-    border-radius: 0;
-    padding: 0 5px;
+#workspaces label {
+    padding: 0;
+}
+
+#workspaces button {
+    padding: 0 6px;
     font-weight: normal;
 }
 
+#workspaces button:hover {
+    box-shadow: inherit;
+    text-shadow: inherit;
+    background: #eff0f2;
+}
+
 #workspaces button.focused {
-    background: #e2e4e1;
+    background: #dee2e0;
+}
+
+#idle_inhibitor {
+    margin: 0;
+    padding: 2px 12px 2px 6px;
+}
+
+#idle_inhibitor.activated {
+    color: #eff0f2;
+    background: #a32a3a;
+    text-shadow: 1px 1px 0 #ae4e2a;
 }