no more waybar
This commit is contained in:
Benjamin Palko
parent
f124e07cb6
commit
e8114c9f94
4 changed files with 0 additions and 499 deletions
|
|
@ -1,140 +0,0 @@
|
||||||
// -*- mode: jsonc -*-
|
|
||||||
{
|
|
||||||
"layer": "top", // Waybar at top layer
|
|
||||||
// "position": "bottom", // Waybar position (top|bottom|left|right)
|
|
||||||
"height": 36, // Waybar height (to be removed for auto height)
|
|
||||||
// "width": 1280, // Waybar width
|
|
||||||
"spacing": 8, // Gaps between modules (4px)
|
|
||||||
// Choose the order of the modules
|
|
||||||
"modules-left": [
|
|
||||||
"custom/os",
|
|
||||||
"hyprland/workspaces",
|
|
||||||
"tray",
|
|
||||||
"hyprland/window",
|
|
||||||
],
|
|
||||||
"modules-center": ["mpris"],
|
|
||||||
"modules-right": [
|
|
||||||
"custom/swww",
|
|
||||||
"wireplumber",
|
|
||||||
"network",
|
|
||||||
"cpu",
|
|
||||||
"memory",
|
|
||||||
"temperature",
|
|
||||||
"idle_inhibitor",
|
|
||||||
"clock",
|
|
||||||
"custom/swaync",
|
|
||||||
],
|
|
||||||
"custom/os": {
|
|
||||||
"format": "",
|
|
||||||
"on-click": "~/.config/rofi/scripts/powermenu_t1",
|
|
||||||
},
|
|
||||||
"idle_inhibitor": {
|
|
||||||
"format": "{icon}",
|
|
||||||
"tooltip-format-activated": "On",
|
|
||||||
"tooltip-format-deactivated": "Off",
|
|
||||||
"format-icons": {
|
|
||||||
"activated": "",
|
|
||||||
"deactivated": "",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
"hyprland/workspaces": {
|
|
||||||
"active-only": false,
|
|
||||||
"format": "{icon}",
|
|
||||||
"format-icons": {
|
|
||||||
"default": "",
|
|
||||||
"1": "",
|
|
||||||
"2": "",
|
|
||||||
"3": "",
|
|
||||||
"4": "",
|
|
||||||
},
|
|
||||||
"persistent-workspaces": {
|
|
||||||
"*": 4, // 5 workspaces by default on every monitor
|
|
||||||
},
|
|
||||||
},
|
|
||||||
"hyprland/window": {
|
|
||||||
"format": "{}",
|
|
||||||
"rewrite": {
|
|
||||||
"(.*) — Mozilla Firefox": " $1",
|
|
||||||
"~(.*)": " $1",
|
|
||||||
"nv": " neovim",
|
|
||||||
},
|
|
||||||
"separate-outputs": true,
|
|
||||||
"max-length": "40",
|
|
||||||
},
|
|
||||||
"tray": {
|
|
||||||
"icon-size": 18,
|
|
||||||
"spacing": 10,
|
|
||||||
},
|
|
||||||
"clock": {
|
|
||||||
"timezone": "America/New_York",
|
|
||||||
"tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
|
|
||||||
"format-alt": "{:%Y-%m-%d}",
|
|
||||||
"on-click": "",
|
|
||||||
},
|
|
||||||
"cpu": {
|
|
||||||
"format": " {usage}%",
|
|
||||||
"tooltip": true,
|
|
||||||
},
|
|
||||||
"memory": {
|
|
||||||
"format": " {}%",
|
|
||||||
},
|
|
||||||
"temperature": {
|
|
||||||
// "thermal-zone": 2,
|
|
||||||
// "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
|
|
||||||
"critical-threshold": 80,
|
|
||||||
// "format-critical": "{temperatureC}°C {icon}",
|
|
||||||
"format": "{icon} {temperatureC}°C",
|
|
||||||
"format-icons": ["", "", "", "", ""],
|
|
||||||
},
|
|
||||||
"wireplumber": {
|
|
||||||
"format": " {volume}%",
|
|
||||||
"format-mute": " {volume}%",
|
|
||||||
"on-click": "~/.config/rofi/applets/bin/volume.sh",
|
|
||||||
},
|
|
||||||
"network": {
|
|
||||||
// "interface": "wlp2*", // (Optional) To force the use of this interface
|
|
||||||
"tooltip-format": "{essid}",
|
|
||||||
"format-wifi": " {signalStrength}%",
|
|
||||||
"format-ethernet": "",
|
|
||||||
"format-linked": "{ifname} (No IP) ",
|
|
||||||
"format-disconnected": "",
|
|
||||||
//"format-alt": "{ifname}: {ipaddr}/{cidr}"
|
|
||||||
},
|
|
||||||
"mpris": {
|
|
||||||
"format": "{player_icon} {dynamic}",
|
|
||||||
"format-paused": "{status_icon} <i>{dynamic}</i>",
|
|
||||||
"player-icons": {
|
|
||||||
"default": "▶",
|
|
||||||
"mpv": "🎵",
|
|
||||||
"spotify": "",
|
|
||||||
"firefox": "",
|
|
||||||
},
|
|
||||||
"interval": 1,
|
|
||||||
"status-icons": {
|
|
||||||
"paused": "⏸",
|
|
||||||
},
|
|
||||||
"dynamic-len": 36,
|
|
||||||
"on-click-middle": "playerctld shift",
|
|
||||||
},
|
|
||||||
"custom/swaync": {
|
|
||||||
"format": "{icon}",
|
|
||||||
"exec": "swaync-client -swb",
|
|
||||||
"return-type": "json",
|
|
||||||
"on-click": "sleep 0.1 && swaync-client -t -sw",
|
|
||||||
"format-icons": {
|
|
||||||
"notification": "<span foreground='red'><small><sup>⬤</sup></small></span>",
|
|
||||||
"none": " ",
|
|
||||||
"dnd-notification": "<span foreground='red'><small><sup>⬤</sup></small></span>",
|
|
||||||
"dnd-none": " ",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
"custom/swww": {
|
|
||||||
"format": "{icon}",
|
|
||||||
"tooltip": false,
|
|
||||||
"tooltip-format": "Change Wallpaper",
|
|
||||||
"on-click": "~/dotfiles/.scripts/pywal-swww.sh",
|
|
||||||
"format-icons": {
|
|
||||||
"default": "",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
@ -1,190 +0,0 @@
|
||||||
#!/usr/bin/env python3
|
|
||||||
import gi
|
|
||||||
gi.require_version("Playerctl", "2.0")
|
|
||||||
from gi.repository import Playerctl, GLib
|
|
||||||
from gi.repository.Playerctl import Player
|
|
||||||
import argparse
|
|
||||||
import logging
|
|
||||||
import sys
|
|
||||||
import signal
|
|
||||||
import gi
|
|
||||||
import json
|
|
||||||
import os
|
|
||||||
from typing import List
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
def signal_handler(sig, frame):
|
|
||||||
logger.info("Received signal to stop, exiting")
|
|
||||||
sys.stdout.write("\n")
|
|
||||||
sys.stdout.flush()
|
|
||||||
# loop.quit()
|
|
||||||
sys.exit(0)
|
|
||||||
|
|
||||||
|
|
||||||
class PlayerManager:
|
|
||||||
def __init__(self, selected_player=None, excluded_player=[]):
|
|
||||||
self.manager = Playerctl.PlayerManager()
|
|
||||||
self.loop = GLib.MainLoop()
|
|
||||||
self.manager.connect(
|
|
||||||
"name-appeared", lambda *args: self.on_player_appeared(*args))
|
|
||||||
self.manager.connect(
|
|
||||||
"player-vanished", lambda *args: self.on_player_vanished(*args))
|
|
||||||
|
|
||||||
signal.signal(signal.SIGINT, signal_handler)
|
|
||||||
signal.signal(signal.SIGTERM, signal_handler)
|
|
||||||
signal.signal(signal.SIGPIPE, signal.SIG_DFL)
|
|
||||||
self.selected_player = selected_player
|
|
||||||
self.excluded_player = excluded_player.split(',') if excluded_player else []
|
|
||||||
|
|
||||||
self.init_players()
|
|
||||||
|
|
||||||
def init_players(self):
|
|
||||||
for player in self.manager.props.player_names:
|
|
||||||
if player.name in self.excluded_player:
|
|
||||||
continue
|
|
||||||
if self.selected_player is not None and self.selected_player != player.name:
|
|
||||||
logger.debug(f"{player.name} is not the filtered player, skipping it")
|
|
||||||
continue
|
|
||||||
self.init_player(player)
|
|
||||||
|
|
||||||
def run(self):
|
|
||||||
logger.info("Starting main loop")
|
|
||||||
self.loop.run()
|
|
||||||
|
|
||||||
def init_player(self, player):
|
|
||||||
logger.info(f"Initialize new player: {player.name}")
|
|
||||||
player = Playerctl.Player.new_from_name(player)
|
|
||||||
player.connect("playback-status",
|
|
||||||
self.on_playback_status_changed, None)
|
|
||||||
player.connect("metadata", self.on_metadata_changed, None)
|
|
||||||
self.manager.manage_player(player)
|
|
||||||
self.on_metadata_changed(player, player.props.metadata)
|
|
||||||
|
|
||||||
def get_players(self) -> List[Player]:
|
|
||||||
return self.manager.props.players
|
|
||||||
|
|
||||||
def write_output(self, text, player):
|
|
||||||
logger.debug(f"Writing output: {text}")
|
|
||||||
|
|
||||||
output = {"text": text,
|
|
||||||
"class": "custom-" + player.props.player_name,
|
|
||||||
"alt": player.props.player_name}
|
|
||||||
|
|
||||||
sys.stdout.write(json.dumps(output) + "\n")
|
|
||||||
sys.stdout.flush()
|
|
||||||
|
|
||||||
def clear_output(self):
|
|
||||||
sys.stdout.write("\n")
|
|
||||||
sys.stdout.flush()
|
|
||||||
|
|
||||||
def on_playback_status_changed(self, player, status, _=None):
|
|
||||||
logger.debug(f"Playback status changed for player {player.props.player_name}: {status}")
|
|
||||||
self.on_metadata_changed(player, player.props.metadata)
|
|
||||||
|
|
||||||
def get_first_playing_player(self):
|
|
||||||
players = self.get_players()
|
|
||||||
logger.debug(f"Getting first playing player from {len(players)} players")
|
|
||||||
if len(players) > 0:
|
|
||||||
# if any are playing, show the first one that is playing
|
|
||||||
# reverse order, so that the most recently added ones are preferred
|
|
||||||
for player in players[::-1]:
|
|
||||||
if player.props.status == "Playing":
|
|
||||||
return player
|
|
||||||
# if none are playing, show the first one
|
|
||||||
return players[0]
|
|
||||||
else:
|
|
||||||
logger.debug("No players found")
|
|
||||||
return None
|
|
||||||
|
|
||||||
def show_most_important_player(self):
|
|
||||||
logger.debug("Showing most important player")
|
|
||||||
# show the currently playing player
|
|
||||||
# or else show the first paused player
|
|
||||||
# or else show nothing
|
|
||||||
current_player = self.get_first_playing_player()
|
|
||||||
if current_player is not None:
|
|
||||||
self.on_metadata_changed(current_player, current_player.props.metadata)
|
|
||||||
else:
|
|
||||||
self.clear_output()
|
|
||||||
|
|
||||||
def on_metadata_changed(self, player, metadata, _=None):
|
|
||||||
logger.debug(f"Metadata changed for player {player.props.player_name}")
|
|
||||||
player_name = player.props.player_name
|
|
||||||
artist = player.get_artist()
|
|
||||||
title = player.get_title()
|
|
||||||
|
|
||||||
track_info = ""
|
|
||||||
if player_name == "spotify" and "mpris:trackid" in metadata.keys() and ":ad:" in player.props.metadata["mpris:trackid"]:
|
|
||||||
track_info = "Advertisement"
|
|
||||||
elif artist is not None and title is not None:
|
|
||||||
track_info = f"{artist} - {title}"
|
|
||||||
else:
|
|
||||||
track_info = title
|
|
||||||
|
|
||||||
if track_info:
|
|
||||||
if player.props.status == "Playing":
|
|
||||||
track_info = " " + track_info
|
|
||||||
else:
|
|
||||||
track_info = " " + track_info
|
|
||||||
# only print output if no other player is playing
|
|
||||||
current_playing = self.get_first_playing_player()
|
|
||||||
if current_playing is None or current_playing.props.player_name == player.props.player_name:
|
|
||||||
self.write_output(track_info, player)
|
|
||||||
else:
|
|
||||||
logger.debug(f"Other player {current_playing.props.player_name} is playing, skipping")
|
|
||||||
|
|
||||||
def on_player_appeared(self, _, player):
|
|
||||||
logger.info(f"Player has appeared: {player.name}")
|
|
||||||
if player is not None and (self.selected_player is None or player.name == self.selected_player):
|
|
||||||
self.init_player(player)
|
|
||||||
else:
|
|
||||||
logger.debug(
|
|
||||||
"New player appeared, but it's not the selected player, skipping")
|
|
||||||
|
|
||||||
def on_player_vanished(self, _, player):
|
|
||||||
logger.info(f"Player {player.props.player_name} has vanished")
|
|
||||||
self.show_most_important_player()
|
|
||||||
|
|
||||||
def parse_arguments():
|
|
||||||
parser = argparse.ArgumentParser()
|
|
||||||
|
|
||||||
# Increase verbosity with every occurrence of -v
|
|
||||||
parser.add_argument("-v", "--verbose", action="count", default=0)
|
|
||||||
|
|
||||||
parser.add_argument("-x", "--exclude", "- Comma-separated list of excluded player")
|
|
||||||
|
|
||||||
# Define for which player we"re listening
|
|
||||||
parser.add_argument("--player")
|
|
||||||
|
|
||||||
parser.add_argument("--enable-logging", action="store_true")
|
|
||||||
|
|
||||||
return parser.parse_args()
|
|
||||||
|
|
||||||
|
|
||||||
def main():
|
|
||||||
arguments = parse_arguments()
|
|
||||||
|
|
||||||
# Initialize logging
|
|
||||||
if arguments.enable_logging:
|
|
||||||
logfile = os.path.join(os.path.dirname(
|
|
||||||
os.path.realpath(__file__)), "media-player.log")
|
|
||||||
logging.basicConfig(filename=logfile, level=logging.DEBUG,
|
|
||||||
format="%(asctime)s %(name)s %(levelname)s:%(lineno)d %(message)s")
|
|
||||||
|
|
||||||
# Logging is set by default to WARN and higher.
|
|
||||||
# With every occurrence of -v it's lowered by one
|
|
||||||
logger.setLevel(max((3 - arguments.verbose) * 10, 0))
|
|
||||||
|
|
||||||
logger.info("Creating player manager")
|
|
||||||
if arguments.player:
|
|
||||||
logger.info(f"Filtering for player: {arguments.player}")
|
|
||||||
if arguments.exclude:
|
|
||||||
logger.info(f"Exclude player {arguments.exclude}")
|
|
||||||
|
|
||||||
player = PlayerManager(arguments.player, arguments.exclude)
|
|
||||||
player.run()
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
main()
|
|
||||||
118
waybar/style.css
118
waybar/style.css
|
|
@ -1,118 +0,0 @@
|
||||||
/*
|
|
||||||
* Color Palette
|
|
||||||
*/
|
|
||||||
@import url("../../.cache/wal/colors-waybar.css");
|
|
||||||
|
|
||||||
* {
|
|
||||||
/* `otf-font-awesome` is required to be installed for icons */
|
|
||||||
font-family: "JetBrainsMono Nerd Font", "Iosevka Nerd Font", FontAwesome,
|
|
||||||
Roboto, Helvetica, Arial, sans-serif;
|
|
||||||
text-shadow: none;
|
|
||||||
transition: color 0.5s ease-in-out;
|
|
||||||
transition: background-color 0.5s ease-in-out;
|
|
||||||
font-size: 16px;
|
|
||||||
}
|
|
||||||
|
|
||||||
@define-color button @color1;
|
|
||||||
@define-color button-hover @color3;
|
|
||||||
@define-color button-active @color2;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* General
|
|
||||||
*/
|
|
||||||
@import url("./styles/waybar.css");
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Workspaces
|
|
||||||
*/
|
|
||||||
#workspaces {
|
|
||||||
border-radius: 9999px;
|
|
||||||
background: @button;
|
|
||||||
}
|
|
||||||
|
|
||||||
#workspaces button {
|
|
||||||
padding: 0 9px 0 4px;
|
|
||||||
box-shadow: none;
|
|
||||||
border: none;
|
|
||||||
border-radius: 9999px;
|
|
||||||
color: @color7;
|
|
||||||
font-size: 24px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#workspaces button.active {
|
|
||||||
color: @button-active;
|
|
||||||
}
|
|
||||||
|
|
||||||
#workspaces button:hover {
|
|
||||||
background: transparent;
|
|
||||||
color: @button-hover;
|
|
||||||
}
|
|
||||||
|
|
||||||
#workspaces button.focused {
|
|
||||||
color: @button-active;
|
|
||||||
}
|
|
||||||
|
|
||||||
#workspaces button.urgent {
|
|
||||||
color: #bf616a;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Modules
|
|
||||||
*/
|
|
||||||
#cpu,
|
|
||||||
#memory,
|
|
||||||
#network,
|
|
||||||
#temperature {
|
|
||||||
color: @color7;
|
|
||||||
}
|
|
||||||
|
|
||||||
#clock,
|
|
||||||
#idle_inhibitor,
|
|
||||||
#mpris,
|
|
||||||
#wireplumber {
|
|
||||||
background: @button;
|
|
||||||
}
|
|
||||||
|
|
||||||
#clock:hover,
|
|
||||||
#idle_inhibitor:hover,
|
|
||||||
#mpris:hover,
|
|
||||||
#custom-swaync:hover,
|
|
||||||
#wireplumber:hover,
|
|
||||||
#custom-swww:hover,
|
|
||||||
#custom-os:hover {
|
|
||||||
background: @button-hover;
|
|
||||||
}
|
|
||||||
|
|
||||||
#idle_inhibitor.activated {
|
|
||||||
background-color: @button-active;
|
|
||||||
}
|
|
||||||
|
|
||||||
#idle_inhibitor {
|
|
||||||
padding: 0 16px 0 12px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#mpris.spotify {
|
|
||||||
background-color: #1db954;
|
|
||||||
}
|
|
||||||
|
|
||||||
#network.disconnected {
|
|
||||||
color: #f53c3c;
|
|
||||||
}
|
|
||||||
|
|
||||||
#temperature.critical {
|
|
||||||
color: #bf616a;
|
|
||||||
}
|
|
||||||
|
|
||||||
#wireplumber.muted {
|
|
||||||
color: #f53c3c;
|
|
||||||
}
|
|
||||||
|
|
||||||
#custom-swww {
|
|
||||||
padding: 0 16px 0 10px;
|
|
||||||
font-size: 18px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#custom-os {
|
|
||||||
padding: 0 14px 0 8px;
|
|
||||||
font-size: 24px;
|
|
||||||
}
|
|
||||||
|
|
@ -1,51 +0,0 @@
|
||||||
window#waybar {
|
|
||||||
background: @background;
|
|
||||||
animation: fadeIn 2.5s;
|
|
||||||
padding: 2px 0 2px 0;
|
|
||||||
border-radius: 0 0 20px 20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
button {
|
|
||||||
text-shadow: 2px 2px;
|
|
||||||
}
|
|
||||||
|
|
||||||
window#waybar.hidden {
|
|
||||||
opacity: 0.2;
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes fadeIn {
|
|
||||||
0% {
|
|
||||||
opacity: 0;
|
|
||||||
}
|
|
||||||
100% {
|
|
||||||
opacity: 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.module {
|
|
||||||
border-radius: 9999px;
|
|
||||||
margin: 8px 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
label.module {
|
|
||||||
padding: 0 10px;
|
|
||||||
/* box-shadow: inset 0 -2px; */
|
|
||||||
}
|
|
||||||
|
|
||||||
box.module {
|
|
||||||
padding: 0 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.modules-left {
|
|
||||||
padding: 0 3px;
|
|
||||||
margin-left: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.modules-center {
|
|
||||||
padding: 0 3px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.modules-right {
|
|
||||||
padding: 0 3px;
|
|
||||||
margin-right: 10px;
|
|
||||||
}
|
|
||||||
Loading…
Add table
Reference in a new issue