Change most things to symlinks instead of hardlinks

3 files changed, 74 insertions, 37 deletions

diff --git a/waybar/.install.yml b/waybar/.install.yml
deleted file mode 100644
index 5afef9c..0000000
--- a/waybar/.install.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: Configure waybar
-steps:
-  - !Link
-    from: "config"
-    to: "~/.config/waybar/config"
-    recursive: false
-  - !Link
-    from: "style.css"
-    to: "~/.config/waybar/style.css"
-    recursive: false
-  - !Link
-    from: "scripts/mediaplayer.py"
-    to: "~/.config/waybar/scripts/mediaplayer.py"
-    recursive: false
\ No newline at end of file
diff --git a/waybar/config b/waybar/config
index 0693742..8feb749 100644
--- a/waybar/config
+++ b/waybar/config
@@ -1,10 +1,26 @@
 {
     "height": 30, 
-    "spacing": 4, 
+    "spacing": 0, 
     "layer": "top",
-    "modules-left": ["hyprland/workspaces", "hyprland/window"],
+    "modules-left": ["sway/workspaces", "sway/mode", "hyprland/workspaces", "hyprland/window"],
     "modules-center": [],
-    "modules-right": ["tray", "custom/idle-inhibitor", "network#vpnovpn", "network#vpnwg", "network#e", "network#wl", "network", "cpu", "memory", "backlight", "pulseaudio", "battery", "clock"],
+    "modules-right": ["tray", "idle_inhibitor", "network#vpnovpn", "network#vpnwg", "network#e", "network#wl", "network", "cpu", "memory", "pulseaudio", "battery", "power-profiles-daemon", "clock"],
+    "sway/workspaces": {
+        "disable-scroll": true,
+        "all-outputs": false,
+        "format": "{name}",
+    },
+    "power-profiles-daemon": {
+      "format": "{icon}",
+      "tooltip-format": "Power profile: {profile}\nDriver: {driver}",
+      "tooltip": true,
+      "format-icons": {
+        "default": " ",
+        "performance": " ",
+        "balanced": "",
+        "power-saver": " "
+      }
+    },
     "hyprland/workspaces": {
         "disable-scroll": true,
         "all-outputs": false,
@@ -19,7 +35,7 @@
     "clock": {
         "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
         "format": "{:%d %b  %H:%M:%OS}",
-        "format-alt": "{:%Y-%m-%d}",
+        "format-alt": "{:%Y-%m-%d %H:%M:%OS}",
         "interval": 1
     },
     "battery": {
@@ -27,10 +43,12 @@
         "states": {
             "full": 100,
             "normal": 99,
-            "warning": 30,
-            "critical": 15,
+            "low": 20,
+            "warning": 10,
+            "critical": 5,
         },
         "format": "{icon} {capacity}%",
+        "format-alt": "{icon} {capacity}% ({power:0.1f} W)",
         "design-capacity": false,
         "format-charging": "{icon} {capacity}% ",
         "format-charging-full": "󱟢 {capacity}% ",
@@ -86,17 +104,21 @@
         "format-disconnected": "",
     },
     "network#vpnwg": {
-        "interface": "*-wg-*",
-        "format": "",
-        "format-alt": "{ifname}: {ipaddr}/{cidr}",
+        "interface": "wg*",
+        "format": "󰟥  {ifname}",
+        "format-alt": "󰟥  {ifname}: {ipaddr}/{cidr}",
         "format-linked": "",
         "format-disconnected": "",
     },
     "pulseaudio": {
-        "format": "{icon} {volume}%  {format_source}",
-        "format-bluetooth": " {volume}%  {format_source}",
-        "format-bluetooth-muted": " 0%  {format_source}",
-        "format-muted": "󰝟   {format_source}",
+        "format": "{icon} {volume}%",
+        "format-bluetooth": " {volume}%",
+        "format-bluetooth-muted": " 0%",
+        "format-muted": "󰝟 ",
+        // "format": "{icon} {volume}%  {format_source}",
+        // "format-bluetooth": " {volume}%  {format_source}",
+        // "format-bluetooth-muted": " 0%  {format_source}",
+        // "format-muted": "󰝟   {format_source}",
         "format-source": " {volume}%",
         "format-source-muted": " 0%",
         "format-icons": {
@@ -108,11 +130,22 @@
             "car": " ",
             "default": [" ", " ", " "]
         },
+        "states": {
+            "normal": 100,
+            "warning": 1000
+        },
         "on-click": "pactl set-sink-mute @DEFAULT_SINK@ toggle",
         "on-click-right": "pavucontrol",
         "ignored-sinks": ["Easy Effects Sink"],
         "scroll-step": 0.5
     },
+    "idle_inhibitor": {
+        "format": "{icon}",
+        "format-icons": {
+            "deactivated": "󰒲 ",
+            "activated": "󰒳 "
+        }
+    },
     "custom/idle-inhibitor": {
         "exec": "~/bin/get-inhibit-idle-status.sh",
         "exec-on-event": true,
diff --git a/waybar/style.css b/waybar/style.css
index bf9ee33..065056d 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -1,6 +1,6 @@
 * {
     /* `otf-font-awesome` is required to be installed for icons */
-    font-family: Iosevka Nerd Font;
+    font-family: Iosevka SS08;
     font-size: 13px;
 }
 
@@ -42,7 +42,7 @@ button {
     background: rgba(0, 0, 0, 0.2);
 }
 
-#workspaces button.active {
+#workspaces button.focused, button.active {
     background-color: #434e59;
 }
 
@@ -55,7 +55,7 @@ button {
     background-color: #434e59;
 }
 
-#custom-idle-inhibitor.suspended {
+#custom-idle-inhibitor.suspended, #idle_inhibitor.activated {
     background: #D54B00;
 }
 
@@ -83,19 +83,37 @@ button {
     color: #ffffff;
 }
 
+#pulseaudio.muted {
+    color: #434e59;
+}
+
+#pulseaudio.warning {
+    color: #FFBF00;
+}
+
 #window,
 #workspaces {
     margin: 0 4px;
 }
 
-#battery.charging.critical {
-    background: none;
+#battery.low:not(.charging) {
+    color: #eb4d4b;
 }
 
-#battery.critical {
+#battery.warning:not(.charging) {
     background: #eb4d4b;
 }
 
+#battery.critical:not(.charging) {
+    background: #eb4d4b;
+    color: #ffffff;
+    animation-name: critical-blink;
+    animation-duration: 0.5s;
+    animation-timing-function: steps(2, start);
+    animation-iteration-count: infinite;
+    animation-direction: alternate;
+}
+
 /* If workspaces is the leftmost module, omit left margin */
 .modules-left > widget:first-child > #workspaces {
     margin-left: 0;
@@ -106,10 +124,10 @@ button {
     margin-right: 0;
 }
 
-@keyframes blink {
-    to {
-        background-color: #ffffff;
-        color: #000000;
+@keyframes critical-blink {
+    50% {
+        background: none;
+        color: #eb4d4b;
     }
 }