From daa5edc98b3d353e702e6c91ce89a94fa88add34 Mon Sep 17 00:00:00 2001 From: DerTyp7 Date: Sun, 19 Oct 2025 01:10:40 +0200 Subject: [PATCH] Fixed setup --- .gitignore | 29 ++++++++ README.md | 7 +- setup.sh => install-packages.sh | 18 +---- waybar/mediaplayer.py | 127 ++++++++++++++++++++++++++++++++ waybar/waybar.sh | 10 +++ 5 files changed, 174 insertions(+), 17 deletions(-) create mode 100644 .gitignore rename setup.sh => install-packages.sh (57%) create mode 100755 waybar/mediaplayer.py create mode 100755 waybar/waybar.sh diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..bd14ac9 --- /dev/null +++ b/.gitignore @@ -0,0 +1,29 @@ +* +!install-packages.sh +!README.md +!install-software.md +!.gitignore + +!alacritty +!alacritty/alacritty.toml + +!fastfetch +!fastfetch/config.jsonc + +!fish +!fish/* +!fish/*/** + +!hypr +!hypr/* +!hypr/*/** + +!swaylock +!swaylock/config + +!waybar +!waybar/* +!waybar/*/** + +!wofi +!wofi/* \ No newline at end of file diff --git a/README.md b/README.md index 2d64d9a..ba29778 100644 --- a/README.md +++ b/README.md @@ -4,13 +4,14 @@ My personal configuration files for various applications and tools running on Ca ## Installation -1. To set up my dotfiles on your system, you can use the following command: +1. Install packages: ```bash -curl -sL https://raw.githubusercontent.com/DerTyp7/.dotfiles/refs/heads/master/setup.sh | bash +curl -sL https://raw.githubusercontent.com/DerTyp7/.dotfiles/refs/heads/master/install-packages.sh | bash ``` -2. Follow these guides: +2. (optional) Download config files from this repository to your `~/.config` directory +3. Follow these guides: - [Setting Up Proton-CachyOS with Lutris and Heroic](https://wiki.cachyos.org/configuration/gaming/#setting-up-proton-cachyos-with-lutris-and-heroic) - [Pre-caching shaders with Proton-CachyOS, -GE and -EM](https://wiki.cachyos.org/configuration/gaming/#pre-caching-shaders-with-proton-cachyos--ge-and--em) - [How to add game-performance to Steam, Lutris and Heroic Games Launcher](https://wiki.cachyos.org/configuration/gaming/#how-to-add-game-performance-to-steam-lutris-and-heroic-games-launcher) diff --git a/setup.sh b/install-packages.sh similarity index 57% rename from setup.sh rename to install-packages.sh index 7a0d417..ae59a3b 100644 --- a/setup.sh +++ b/install-packages.sh @@ -1,5 +1,3 @@ -#!/bin/bash - sudo pacman -Syu --noconfirm\ cachyos-gaming-meta \ cachyos-gaming-applications \ @@ -10,7 +8,8 @@ sudo pacman -Syu --noconfirm\ discord \ obs-studio \ vlc \ - brave-bin + brave-bin \ + ttf-jetbrains-mono-nerd paru -Syu --noconfirm \ teamspeak \ @@ -18,14 +17,5 @@ paru -Syu --noconfirm \ brave-bin \ prismlauncher \ bottles \ - signal-desktop - -git clone https://github.com/DerTyp7/.dotfiles.git ~/.config/ -rsync -a ~/.config/.dotfiles/ ~/.config/ && rm -rf ~/.config/.dotfiles - -read -r -p "Reboot now? (Y/n) " reply -if [[ $reply =~ ^[Yy] ]]; then - sudo reboot now -else - exit 0 -fi \ No newline at end of file + signal-desktop \ + visual-studio-code-bin diff --git a/waybar/mediaplayer.py b/waybar/mediaplayer.py new file mode 100755 index 0000000..7404f48 --- /dev/null +++ b/waybar/mediaplayer.py @@ -0,0 +1,127 @@ +#!/usr/bin/env python3 +import argparse +import logging +import sys +import signal +import gi +import json +gi.require_version('Playerctl', '2.0') +from gi.repository import Playerctl, GLib + +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 occurance 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) + + 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() diff --git a/waybar/waybar.sh b/waybar/waybar.sh new file mode 100755 index 0000000..d03b9eb --- /dev/null +++ b/waybar/waybar.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env sh + +# Terminate already running bar instances +killall -q waybar + +# Wait until the processes have been shut down +while pgrep -x waybar >/dev/null; do sleep 1; done + +# Launch main +waybar &