niri, waybar, swaylock

dotfiles/dot_config/waybar/config

@@ -1,51 +1,104 @@
 {
-    "modules-left": ["clock", "niri/workspaces", "custom/media"],
-    "modules-center": ["niri/window"],
-    "modules-right": ["tray", "pulseaudio", "idle_inhibitor", "custom/power"],
+  "modules-left": [
+    "clock",
+    "niri/workspaces",
+    "wlr/taskbar",
+    "mpris"
+  ],
+  "modules-center": [
+    "niri/window"
+  ],
+  "modules-right": [
+    "tray",
+    "cpu",
+    "memory",
+    "network",
+    "wireplumber",
+    "power-profiles-daemon",
+    "upower"
+  ],
 
-    "network": {
-        "format-wifi": "{essid} ({signalStrength}%) ",
-        "format-ethernet": "{ifname} ",
-        "format-disconnected": "",
-        "max-length": 50,
-        "on-click": "kitty -e 'nmtui'"
+  "power-profiles-daemon": {
+    "format": "{icon}",
+    "tooltip-format": "Power profile: {profile}\nDriver: {driver}",
+    "tooltip": true,
+    "format-icons": {
+      "default": "",
+      "performance": "",
+      "balanced": "",
+      "power-saver": ""
+    }
+  },
+  "memory": {
+    "interval": 30,
+    "format": "{used:0.1f}G/{total:0.1f}G ",
+    "on-click": "gnome-system-monitor"
+  },
+  "cpu": {
+    "interval": 10,
+    "format": "{}% ",
+    "max-length": 10,
+    "on-click": "gnome-system-monitor"
+  },
+  "network": {
+    "format-wifi": "{essid} ",
+    "format-ethernet": "{ifname} ",
+    "format-disconnected": "",
+    "max-length": 50,
+    "on-click": "wezterm -e 'nmtui'"
+  },
+  "tray": {
+    "icon-size": 20,
+    "spacing": 10
+  },
+  "clock": {
+    "format": "{:%a %d %b %Y %I:%M}",
+    "on-click": "gnome-calendar",
+  },
+  "wireplumber": {
+    "format": "{volume}% {icon}",
+    "format-muted": "",
+    "on-click": "helvum",
+    "format-icons": [
+      "",
+      "",
+      ""
+    ],
+    "on-click": "pavucontrol"
+  },
+  "mpris": {
+    "format": "{player_icon} {dynamic}",
+    "format-paused": "{status_icon} <i>{dynamic}</i>",
+    "dynamic-len": 100,
+    "player-icons": {
+      "default": "▶",
     },
-    "idle_inhibitor": {
-        "format": "{icon}",
-        "format-icons": {
-            "activated": "",
-            "deactivated": ""
-        },
+    "status-icons": {
+      "paused": "⏸"
     },
-    "tray": {
-        "icon-size": 15,
-        "spacing": 10
+  },
+  "wlr/taskbar": {
+    "format": "{icon}",
+    "icon-size": 20,
+    "icon-theme": "Numix-Circle",
+    "tooltip-format": "{title}",
+    "on-click": "activate",
+    "app_ids-mapping": {
+      "firefoxdeveloperedition": "firefox-developer-edition"
     },
-    "clock": {
-        "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
-        "format-alt": "{:%Y-%m-%d}",
-        "on-click": "gnome-calendar"
-    },
-    "pulseaudio": {
-        "format": "{volume}% {icon} ",
-        "format-bluetooth": "{volume}% {icon} {format_source}",
-        "format-bluetooth-muted": " {icon} {format_source}",
-        "format-muted": "0% {icon} ",
-        "format-source": "{volume}% ",
-        "format-source-muted": "",
-        "format-icons": {
-            "headphone": "",
-            "hands-free": "",
-            "headset": "",
-            "phone": "",
-            "portable": "",
-            "car": "",
-            "default": ["", "", ""]
-        },
-        "on-click": "pavucontrol"
-    },
-	"custom/power": {
-		"format": " ",
-		"on-click": "wlogout"
-	}
+    "ignore-list": [
+      "Signal"
+    ],
+    "rewrite": {
+      "Firefox Web Browser": "Firefox",
+      "Foot Server": "Terminal"
+    }
+  },
+  "niri/workspaces": {
+    "format": "{icon}",
+    "format-icons": {
+      "main": "",
+      "scratchpad": "",
+    }
+  }
 }

dotfiles/dot_config/waybar/style.css

@@ -1,6 +1,6 @@
 * {
     border: none;
-    font-size: 14px;
+    font-size: 12pt;
     font-family: "JetBrainsMono Nerd Font,JetBrainsMono NF" ;
     min-height: 25px;
 }
@@ -10,28 +10,26 @@ window#waybar {
   margin: 5px;
  }
 
-#custom-logo {
-  padding: 0 10px;
-}
-
 .modules-right {
   padding-left: 5px;
-  border-radius: 15px 0 0 15px;
   margin-top: 2px;
-  background: #000000;
+  color: #ccc;
 }
 
 .modules-center {
   padding: 0 15px;
   margin-top: 2px;
-  border-radius: 15px 15px 15px 15px;
-  background: #000000;
+  color: #ccc;
 }
 
 .modules-left {
-  border-radius: 0 15px 15px 0;
   margin-top: 2px;
-  background: #000000;
+  color: #ccc;
+  padding-right: 5px;
+}
+
+#network {
+  padding: 0 10px 0 15px;
 }
 
 #battery,
@@ -40,7 +38,7 @@ window#waybar {
 #custom-powerDraw,
 #bluetooth,
 #pulseaudio,
-#network,
+#wireplumber,
 #disk,
 #memory,
 #backlight,
@@ -53,10 +51,7 @@ window#waybar {
 #window,
 #workspaces,
 #clock {
-  padding: 0 5px;
-}
-#pulseaudio {
-  padding-top: 3px;
+  padding: 0 20px;
 }
 
 #temperature.critical,
@@ -65,11 +60,8 @@ window#waybar {
   padding-top: 0;
 }
 
-
-
-
 #clock{
-  color: #5fd1fa;
+  color: #d8bfff;
 }
 
 #battery.charging {
@@ -92,10 +84,30 @@ window#waybar {
     animation-direction: alternate;
 }
 
+#mpris {
+  margin-left: 15px;
+}
+
+#workspaces button {
+  color: #666;
+}
+
+#workspaces button.empty {
+  color: #222;
+}
+
+#workspaces button.focused
+{
+  color: #ccc;
+}
+
+#taskbar button.active {
+  background: #333;
+}
 
 @keyframes blink {
-    to {
-        background-color: #ffffff;
-        color: #000000;
-    }
+  to {
+    background-color: #ffffff;
+    color: #000000;
+  }
 }