diff --git a/config b/config new file mode 100644 index 0000000..950216d --- /dev/null +++ b/config @@ -0,0 +1,212 @@ +// -*- mode: json -*- + +{ + "layer": "top", + "position": "top", + "margin-left": 4, + "margin-right": 4, + "margin-top": 0, + "margin-bottom": 0, + "spacing": 4, + + "modules-left": ["hyprland/workspaces","hyprland/window"], + + "modules-center": ["group/weather","tray"], + + "modules-right": ["pulseaudio","battery","network","group/info","group/power"], + + "group/power": { + "orientation": "inherit", + "drawer": { + "transition-duration": 500, + "children-class": "not-power", + "transition-left-to-right": false, + }, + "modules": [ + "custom/power", // First element is the "group leader" and won't ever be hidden + "custom/powerm", + "custom/reboot", + "custom/quit", + "custom/lock", + ] + }, + "custom/quit": { + "format": "󰗼", + "tooltip": true, + "tooltip-format": "terminate session", + "on-click": "hyprctl dispatch exit" + }, + "custom/lock": { + "format": "󰍁", + "tooltip": true, + "tooltip-format": "screenlock", + "on-click": "swaylock --screenshots --clock --indicator --effect-pixelate 18 --effect-blur 8x8" + }, + "custom/reboot": { + "format": "󰜉", + "tooltip": true, + "tooltip-format": "reboot", + "on-click": "reboot" + }, + "custom/powerm": { + "format": "", + "tooltip": true, + "tooltip-format": "shutdown!", + "on-click": "sudo systemctl shutdown now" + }, + "group/info": { + "orientation": "inherit", + "drawer": { + "children-class": "group-info", + "parent-class": "group-p-info", + "transition-left-to-right": true, + }, + "modules": [ + "memory", "disk", "cpu" + ] + }, + + "hyprland/workspaces": { + "disable-scroll": true, + "all-outputs": true, + "format": "{name}: {icon} [ {windows} ]", + "format-icons": { + "1": "󰁕", + "2": "󰁕", + "3": "󰁕", + "4": "󰁕", + "5": "󰁕", + "urgent": "󰊰", + "active": "󰢚", + "special": "󰮯", + "default": "󰁕" + }, + "window-rewrite-default": "", + "window-rewrite": { + "foot class": " ", + "foot": "", + "thorium": "󰊯", + "class": "󰝰", + "mercury":"", + "VSCodium": "", + "title": "", + "balenaEtcher": "󱊞", + "title<.*youtube.*>": "", + "title<*netflix.*>": "󰝆", + "title": "", + "title": "󰓓", + "title": "󰓓", + "Invidious": " ", + "class title<.*github.*>": "", // Windows whose class is "firefox" and title contains "github". Note that "class" always comes first. + }, + }, + "hyprland/window": { + "format": " {title}", + "on-click-right": "$HOME/.config/hypr/scripts/screenshot_area", + "rewrite": { + "(.*) - NVIM": " NeoVim", + "(.*) — Mozilla Firefox": "󰈹 Firefox", + "(.*) — Mercury": "󰈹 Mercury", + "": "󰇄 Desktop", + "(.*) Spotify Free": "󰓇 Spotify", + "(.*) Spotify": "󰓇 Spotify", + "(.*) Tidal": "󰽰 Tidal", + " ~": " pika@home", + "(.*) - Obsidian(.*)": "󱓧 Obsidian", + }, + "separate-outputs": false + }, + + "group/weather": { + "orientation": "inherit", + "drawer": { + "transition-duration": 500, + "children-class": "group-weather", + "transition-left-to-right": false, + }, + "modules": [ + "clock", + "custom/weather" + ] + }, + "clock": { + "format": "{:%H:%M}", + "tooltip": true + }, + "custom/weather": { + "format": "{}°", + "tooltip": true, + "interval": 3600, + "exec": "wttrbar", + "return-type": "json" + }, + + "network": { + "interval": 30, + "on-click": "wl-copy $(ip address show up scope global | grep inet | head -n1 | cut -d/ -f 1 | tr -d [:space:] | cut -c5-)", + "on-click-right": "foot $HOME/.config/hypr/scripts/wlan.sh", + "format-wifi": "󰤨 {essid}", + "format-ethernet": "󰈀 Wired", + "fomat-disconnected": "󰤯 Disconnected", + "tooltip-format-wifi": "{essid} ({signalStrength}%)", + "tooltip-format-ethernet": "{ifname} ", + "tooltip-format-disconnected": "Disconnected", + }, + "pulseaudio": { + "format": "{icon} {volume}%", + "format-bluetooth": "{icon} {volume}%", + "format-muted": " ", + "format-icons": { + "headphones": " ", + "default": [ + " ", + " " + ] + }, + "scroll-step": 5, + "on-click": "pamixer -t", + "on-click-right": "pavucontrol" + }, + "memory": { + "interval": 8, + "format": "{icon} {avail}GiB", + "format-icons": "󰝪 ", + "on-click": { + "format": "{icon} {avail}GiB/{total}GiB" + }, + }, + "cpu": { + "interval": 2, + "format": "{icon} {load}%", + "format-icons": " " + }, + "battery": { + "states": { + "good": 95, + "warning": 30, + "critical": 15 + }, + "format": "{icon} {capacity}%", + "format-icons": [ + "󰁺", + "󰁼", + "󰁿", + "󰂁", + "󰁹" + ] + }, + "disk": { + "interval": 32, + "format": "Disk {percentage_used:2}%", + "path": "/" + }, + "tray": { + "icon-size": 20, + "spacing": 10 + }, + "custom/power": { + "format": "⏼ ", + "on-click": "wlogout" + }, + "css-name": "style.css" +} diff --git a/custom-scripts/mediaplayer.py b/custom-scripts/mediaplayer.py deleted file mode 100644 index 3da53e9..0000000 --- a/custom-scripts/mediaplayer.py +++ /dev/null @@ -1,179 +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): - 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 - 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" - 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() - - -if __name__ == "__main__": - main() diff --git a/custom-scripts/update b/custom-scripts/update deleted file mode 100755 index 61a35dc..0000000 --- a/custom-scripts/update +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -sleep 1 -figlet "Update" -sleep 0.5 -echo "." -sleep 0.5 -echo "." -sleep 0.5 -echo "." -sleep 0.5 -arch-update diff --git a/custom-scripts/updates b/custom-scripts/updates deleted file mode 100755 index b6b0be5..0000000 --- a/custom-scripts/updates +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/bash -# _ _ _ _ -# | | | |_ __ __| | __ _| |_ ___ ___ -# | | | | '_ \ / _` |/ _` | __/ _ \/ __| -# | |_| | |_) | (_| | (_| | || __/\__ \ -# \___/| .__/ \__,_|\__,_|\__\___||___/ -# |_| -# -# by Stephan Raabe (2023) -# ----------------------------------------------------- - -# ----------------------------------------------------- -# Define threshholds for color indicators -# ----------------------------------------------------- - -threshhold_green=0 -threshhold_yellow=25 -threshhold_red=100 - -# ----------------------------------------------------- -# Calculate available updates pacman and aur (with aur) -# ----------------------------------------------------- - -if ! updates_arch=$(checkupdates 2> /dev/null | wc -l ); then - updates_arch=0 -fi - -if ! updates_aur=$(paru -Qua | wc -l); then - updates_aur=0 -fi - -updates=$(("$updates_arch" + "$updates_aur")) - -# ----------------------------------------------------- -# Testing -# ----------------------------------------------------- - -# Overwrite updates with numbers for testing -# updates=50 - -# test JSON output -# printf '{"text": "0", "alt": "0", "tooltip": "0 Updates", "class": "red"}' -# exit - -# ----------------------------------------------------- -# Output in JSON format for Waybar Module custom-updates -# ----------------------------------------------------- - -css_class="green" - -if [ "$updates" -gt $threshhold_yellow ]; then - css_class="yellow" -fi - -if [ "$updates" -gt $threshhold_red ]; then - css_class="red" -fi - -if [ "$updates" -gt $threshhold_green ]; then - printf '{"text": "%s", "alt": "%s", "tooltip": "%s Updates", "class": "%s"}' "$updates" "$updates" "$updates" "$css_class" -else - printf '{"text": "0", "alt": "0", "tooltip": "0 Updates", "class": "green"}' -fi diff --git a/style.css b/style.css new file mode 100644 index 0000000..979f492 --- /dev/null +++ b/style.css @@ -0,0 +1,187 @@ +* { + font-size: 1rem; + font-family: Rubik, iMWritingMono Nerd Font; +} +@keyframes urgent-workspace { +from { + color: white; +} +75% { + color: red; +} +to { + color: white; +} +} +@keyframes border-expand { +0% { + border-top: transparent; + border-left: transparent; + border-right: transparent; + border-bottom: solid 2px currentcolor; + border-radius: 100px; +} +33% { + border-top: transparent; + border-left: solid 2px currentcolor; + border-right: solid 2px currentcolor; + border-bottom: solid 2px currentcolor; + border-radius: 66px; +} +66% { + border-top: solid 2px currentcolor; + border-left: solid 2px currentcolor; + border-right: solid 2px currentcolor; + border-bottom: transparent; + border-radius: 33px; +} +to { + border-top: solid 2px currentcolor; + border-radius: 0; + /* border-radius: 0rem 0rem 1rem 1rem; */ +} +} +tooltip { + border: solid 2px currentcolor; + background: black; + color: white; +} +#p-info, +#weather, +#info { + border-top: solid 1px currentcolor; + transition: 650ms; +} +#p-info:hover, +#weather:hover, +#info:hover { + border-bottom: solid 2px currentcolor; + border-top: solid 0px transparent; + transition: 350ms; +} + +#window { + padding: 2px; + color: #fdf6e3; + font-weight: 600; + transition: 300ms; +} +window#waybar { + border: solid 2px rgba(160, 160, 160, 0.329); + border-radius: 6px; + background: transparent; + transition: 700ms; +} +window#waybar.empty { + margin-top: 4px; + border: solid 2px rgba(136, 136, 136, 0.8); +} +window#waybar.fullscreen { + background: rgba(55, 55, 55, 0.6); + margin: 0; + border: solid 3px rgba(145, 11, 53, 0.8); + border-radius: 8px 8px 4px 4px; + transition: 300ms; +} + +#workspaces button { + border-top: solid 1px currentcolor; + border-right: solid 1px currentcolor; + border-bottom: solid 1px transparent; + margin-top: 5px; + margin-left: 0px; + padding: 0; + padding-right: 4px; + transition: 200ms; + border-radius: 2px 2px 2 0; +} +#workspaces button.empty { +} +#workspaces button.active { + color: rgba(255, 238, 0, 0.9); + padding: 0 8px; + margin-top: 0; + margin-right: 2px; + margin-left: 1px; + border-top: solid 2px currentcolor; + border-right: solid 2px currentcolor; + border-radius: 8px 4px 2px 0; +} +#workspaces button.urgent { + color: red; + animation: urgent-workspace ease-out 4s infinite; +} + +#pulseaudio { + color: #cbb643; +} +#p-info, +#info, +#memory { + color: #9649cd; +} +#cpu { + color: #a70a3c; +} +#battery { + color: #859900; +} +#network { + color: #1E90FF; +} +#disk { + color: #b58900; +} +#custom-power { + border-radius: 0 8px 0 0; +} +#custom-weather, +#custom-reboot, +#custom-quit, +#custom-lock, +#custom-powerm, +#custom-power { + padding: 0.2rem 1rem; + margin: 0 1px; + font-weight: 600; + border-top: solid 1px currentcolor; + transition: 350ms; +} +#custom-reboot:hover, +#custom-quit:hover, +#custom-powerm:hover, +#custom-lock:hover, +#custom-power:hover { + border-top: solid 2px red; + transition: 250ms; + margin: 0; + /* border-radius: 2rem; */ + font-size: 1.5rem; +} +#pulseaudio, +#memory, +#cpu, +#battery, +#disk, +#clock, +#network, +#not-power, +#tray { + padding: 6px; + margin: 0px 4px 0; + font-weight: 600; + border-top: solid 2px transparent; + transition: 550ms; +} + +#pulseaudio:hover, +#memory:hover, +#cpu:hover, +#battery:hover, +#disk:hover, +#clock:hover, +#network:hover { + border-top: solid 2px currentcolor; + transition: 250ms; +} +