fix: fixed conflicts + moving to yadm

.config/waybar/config.jsonc

@@ -0,0 +1,23 @@
+{
+  "position": "bottom",
+  "layer": "top",
+  "modules-left": ["group/workspaces-group", "custom/media"],
+  "modules-center": [],
+  "modules-right": [
+    "tray",
+    "group/pulseaudio-group",
+    "group/network-group",
+    "group/power-group",
+    "clock",
+  ],
+  "include": [
+    "~/.config/waybar/modules/workspaces.jsonc",
+    "~/.config/waybar/modules/network.jsonc",
+    "~/.config/waybar/modules/tray.jsonc",
+    "~/.config/waybar/modules/pulseaudio.jsonc",
+    "~/.config/waybar/modules/power.jsonc",
+    "~/.config/waybar/modules/mediaplayer.jsonc",
+    "~/.config/waybar/modules/language.jsonc",
+    "~/.config/waybar/modules/clock.jsonc",
+  ],
+}

.config/waybar/modules/add/mediaplayer.py

@@ -0,0 +1,130 @@
+#!/usr/bin/env python3
+from gi.repository import Playerctl, GLib
+import argparse
+import logging
+import sys
+import signal
+import gi
+import json
+gi.require_version('Playerctl', '2.0')
+
+logger = logging.getLogger(__name__)
+
+
+def write_output(text, player):
+    logger.info('Writing output')
+
+    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 on_play(player, status, manager):
+    logger.info('Received new playback status')
+    on_metadata(player, player.props.metadata, manager)
+
+
+def on_metadata(player, metadata, manager):
+    logger.info('Received new metadata')
+    track_info = ''
+
+    if player.props.player_name == 'spotify' and \
+            'mpris:trackid' in metadata.keys() and \
+            ':ad:' in player.props.metadata['mpris:trackid']:
+        track_info = 'AD PLAYING'
+    elif player.get_artist() != '' and player.get_title() != '':
+        track_info = '{artist} - {title}'.format(artist=player.get_artist(),
+                                                 title=player.get_title())
+    else:
+        track_info = player.get_title()
+
+    if player.props.status != 'Playing' and track_info:
+        track_info = ' ' + track_info
+    write_output(track_info, player)
+
+
+def on_player_appeared(manager, player, selected_player=None):
+    if player is not None and (selected_player is None or player.name == selected_player):
+        init_player(manager, player)
+    else:
+        logger.debug(
+            "New player appeared, but it's not the selected player, skipping")
+
+
+def on_player_vanished(manager, player):
+    logger.info('Player has vanished')
+    sys.stdout.write('\n')
+    sys.stdout.flush()
+
+
+def init_player(manager, name):
+    logger.debug('Initialize player: {player}'.format(player=name.name))
+    player = Playerctl.Player.new_from_name(name)
+    player.connect('playback-status', on_play, manager)
+    player.connect('metadata', on_metadata, manager)
+    manager.manage_player(player)
+    on_metadata(player, player.props.metadata, manager)
+
+
+def signal_handler(sig, frame):
+    logger.debug('Received signal to stop, exiting')
+    sys.stdout.write('\n')
+    sys.stdout.flush()
+    # loop.quit()
+    sys.exit(0)
+
+
+def parse_arguments():
+    parser = argparse.ArgumentParser()
+
+    # Increase verbosity with every occurrence of -v
+    parser.add_argument('-v', '--verbose', action='count', default=0)
+
+    # Define for which player we're listening
+    parser.add_argument('--player')
+
+    return parser.parse_args()
+
+
+def main():
+    arguments = parse_arguments()
+
+    # Initialize logging
+    logging.basicConfig(stream=sys.stderr, level=logging.DEBUG,
+                        format='%(name)s %(levelname)s %(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))
+
+    # Log the sent command line arguments
+    logger.debug('Arguments received {}'.format(vars(arguments)))
+
+    manager = Playerctl.PlayerManager()
+    loop = GLib.MainLoop()
+
+    manager.connect('name-appeared',
+                    lambda *args: on_player_appeared(*args, arguments.player))
+    manager.connect('player-vanished', on_player_vanished)
+
+    signal.signal(signal.SIGINT, signal_handler)
+    signal.signal(signal.SIGTERM, signal_handler)
+    signal.signal(signal.SIGPIPE, signal.SIG_DFL)
+
+    for player in manager.props.player_names:
+        if arguments.player is not None and arguments.player != player.name:
+            logger.debug('{player} is not the filtered player, skipping it'
+                         .format(player=player.name)
+                         )
+            continue
+
+        init_player(manager, player)
+
+    loop.run()
+
+
+if __name__ == '__main__':
+    main()

.config/waybar/modules/add/spotify.sh

@@ -0,0 +1,27 @@
+#!/bin/sh
+
+while true; do
+
+	player_status=$(playerctl status 2>/dev/null)
+
+	if [ -z "$(playerctl metadata album)" ]; then
+		if [ "$player_status" = "Playing" ]; then
+			echo "$(playerctl metadata artist) - $(playerctl metadata title)"
+		elif [ "$player_status" = "Paused" ]; then
+			echo " $(playerctl metadata artist) - $(playerctl metadata title)"
+    else
+			echo ""
+		fi
+	else
+		if [ "$player_status" = "Playing" ]; then
+			echo "<span color='#1db954'></span> $(playerctl metadata artist) - $(playerctl metadata title)"
+		elif [ "$player_status" = "Paused" ]; then
+			echo "<span color='#1db954'></span>  $(playerctl metadata artist) - $(playerctl metadata title)"
+    else
+			echo ""
+		fi
+	fi
+
+	sleep 1
+
+done

.config/waybar/modules/add/waybar-date.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+date +"%a %d"

.config/waybar/modules/add/waybar-logout.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+swaynag -t tokyo-night -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit'

.config/waybar/modules/add/waybar-power.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+swaynag -t tokyo-night -m 'Are you sure you want to shutdown your device?' -b 'Poweroff' 'shutdown -h now'

.config/waybar/modules/add/waybar-sysinfo.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+WAYLAND_DISPLAY=wayland-1 kitty --class=floating_term "fastfetch; sleep 10" &

.config/waybar/modules/clock.jsonc

@@ -0,0 +1,5 @@
+{
+  "clock": {
+    "format": " {:%H:%M}",
+  },
+}

.config/waybar/modules/language.jsonc

@@ -0,0 +1,7 @@
+{
+  "hyprland/language": {
+    "format": " {}",
+    "format-en": "en",
+    "format-ru": "ru",
+  },
+}

.config/waybar/modules/mediaplayer.jsonc

@@ -0,0 +1,14 @@
+{
+  "custom/media": {
+    "format": "{0} {1}",
+    "escape": true,
+    "return-type": "json",
+    "max-length": 40,
+    "on-click": "playerctl play-pause",
+    "on-click-right": "playerctl stop",
+    "smooth-scrolling-threshold": 3, // This value was tested using a trackpad, it should be lowered if using a mouse.
+    "on-scroll-down": "playerctl next",
+    "on-scroll-up": "playerctl previous",
+    "exec": "$HOME/.config/waybar/modules/mediaplayer.py 2> /dev/null", // Script in resources/custom_modules folder
+  },
+}

.config/waybar/modules/mediaplayer.py

@@ -0,0 +1,219 @@
+#!/usr/bin/env python3
+# ruff: noqa: E402
+import argparse
+import json
+import logging
+import os
+import signal
+import sys
+from typing import List
+
+import gi
+
+gi.require_version("Playerctl", "2.0")
+
+import psutil
+import setproctitle
+from gi.repository import GLib, Playerctl  # pyright: ignore reportAttributeAccessIssue
+from gi.repository.Playerctl import Player  # pyright: ignore reportMissingImports
+
+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):
+        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.init_players()
+
+    def init_players(self):
+        for player in self.manager.props.player_names:
+            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)
+
+    # 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}")
+    player = PlayerManager(arguments.player)
+    player.run()
+
+
+app_name = "WaybarPlayerctlBridge"
+for proc in psutil.process_iter(["pid", "name"]):
+    if proc.name() == app_name and proc.pid != os.getpid():
+        print(proc)
+        os.kill(proc.pid, 9)
+
+
+if __name__ == "__main__":
+    setproctitle.setproctitle(app_name)
+    list_of_procs = []
+    main()

.config/waybar/modules/network.jsonc

@@ -0,0 +1,25 @@
+{
+  "group/network-group": {
+    "orientation": "horizontal",
+    "modules": ["bluetooth", "network"],
+  },
+
+  "bluetooth": {
+    "format": "",
+    "format-disabled": "Bd",
+    "format-connected": " ",
+    "on-click": "kitty bluetui",
+    "tooltip-format": "{device_enumerate}",
+    "tooltip-format-enumerate-connected": "{device_alias}",
+  },
+  "network": {
+    "format": "{ifname}",
+    "format-disabled": "Wd",
+    "format-wifi": " ",
+    "format-ethernet": "󰈀 ",
+    "format-disconnected": "󰖪 ",
+    "tooltip-format-wifi": "{essid}",
+    "tooltip-format-ethernet": "{ipaddr}",
+    "on-click": "~/.config/rofi/network-manager/run_manager.sh",
+  },
+}

.config/waybar/modules/power.jsonc

@@ -0,0 +1,23 @@
+{
+  "group/power-group": {
+    "orientation": "horizontal",
+    "modules": ["backlight", "battery"],
+  },
+
+  "battery": {
+    "format": "{icon}",
+    "format-icons": [" ", " ", " ", " ", " "],
+    "format-charging": " ",
+    "tooltip-format": "{capacity}% {timeTo}",
+  },
+  "backlight": {
+    "device": "intel_backlight",
+    "format": "{icon}",
+    "format-icons": ["", "", "", "", "", "", "", "", ""],
+    "smooth-scrolling-threshold": 1, // This value was tested using a trackpad, it should be lowered if using a mouse.
+    "on-scroll-down": "brightnessctl --class='backlight' set 5%+",
+    "on-scroll-up": "brightnessctl --class='backlight' set 5%-",
+    "on-click": "python $HOME/.config/hypr/scripts/swww.py",
+    "tooltip-format": "{percent}%",
+  },
+}

.config/waybar/modules/pulseaudio.jsonc

@@ -0,0 +1,29 @@
+{
+  "group/pulseaudio-group": {
+    "orientation": "horizontal",
+    "modules": ["pulseaudio#input", "pulseaudio#output"],
+  },
+
+  "pulseaudio#output": {
+    "format": "{icon}",
+    "tooltip-format": "{volume}%",
+    "format-muted": " ",
+    "format-icons": {
+      "headphone": " ",
+      "hdmi": "󰽟 ",
+      "default": [" ", " ", " ", " "],
+    },
+    "scroll-step": 1,
+    "on-click": "rofi-mixer",
+    "smooth-scrolling-threshold": 1, // This value was tested using a trackpad, it should be lowered if using a mouse.
+    "on-scroll-down": "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+ -l 1.0",
+    "on-scroll-up": "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%- -l 1.0",
+  },
+  "pulseaudio#input": {
+    "format-source": "",
+    "format-source-muted": "",
+    "tooltip": false,
+    "format": "{format_source}",
+    "on-click": "wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle",
+  },
+}

.config/waybar/modules/tray.jsonc

@@ -0,0 +1,12 @@
+{
+  "tray": {
+    "icon-size": 14,
+    "spacing": 10,
+    "icons": {
+      "Spotify": " ",
+      "Steam": "",
+      "Telegram Desktop": "",
+      "Mattermost Desktop": "",
+    },
+  },
+}

.config/waybar/modules/workspaces.jsonc

@@ -0,0 +1,29 @@
+{
+  "group/workspaces-group": {
+    "orientation": "horizontal",
+    "modules": ["hyprland/windowcount", "hyprland/workspaces"],
+  },
+
+  "hyprland/workspaces": {
+    "format": "{icon}",
+    "tooltip": false,
+    "tooltips": {
+      "default": "{name}: {windows}",
+      "empty": "",
+    },
+    "all-outputs": false,
+    "on-scroll-up": "hyprctl dispatch focusworkspaceoncurrentmonitor r-1",
+    "on-scroll-down": "hyprctl dispatch focusworkspaceoncurrentmonitor r+1",
+    "format-icons": {
+      "active": "",
+      "default": "",
+    },
+  },
+  "hyprland/windowcount": {
+    "format": "{}",
+    "format-empty": "{}",
+    "format-windowed": "{}",
+    "separate-outputs": true,
+    "on-click": "rofi -show window",
+  },
+}

.config/waybar/style.css

@@ -0,0 +1,82 @@
+* {
+  border: none;
+  font-family: "JetBrains Mono Nerd Font";
+  font-size: 16px;
+  font-weight: 700;
+  font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"';
+  min-height: 20px;
+  color: #c0caf5;
+}
+
+window#waybar {
+  background: transparent;
+}
+
+tooltip,
+#clock,
+#tray,
+#language,
+#custom-media,
+#network-group,
+#pulseaudio-group,
+#workspaces-group,
+#power-group {
+  border: 2px solid rgba(192, 202, 245, 0.5);
+  border-radius: 11px;
+  background-color: rgba(32, 33, 44, 0.42);
+  padding-top: 1px;
+  margin-bottom: 2px;
+  margin-top: 1px;
+}
+
+tooltip {
+  background: rgba(32, 33, 44, 0.82);
+}
+tooltip label {
+}
+
+#hyprland-group,
+#custom-media {
+  margin-left: 5px;
+}
+
+#clock,
+#power-group,
+#network-group,
+#pulseaudio-group,
+#tray {
+  margin-right: 5px;
+}
+
+#pulseaudio,
+#custom-media,
+#network,
+#battery,
+#clock,
+#tray,
+#language,
+#backlight,
+#bluetooth,
+#windowcount {
+  padding-left: 12px;
+  padding-right: 12px;
+}
+
+#workspaces button {
+  padding-left: 4px;
+  padding-left: 4px;
+}
+
+#windowcount {
+  padding-right: 4px;
+}
+#network,
+#battery {
+  padding-left: 6px;
+}
+#workspaces,
+#pulseaudio.input,
+#backlight,
+#bluetooth {
+  padding-right: 6px;
+}