baobeld/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge Arch config as main #1

Closed
baobeld wants to merge 228 commits from arch(btw) into master
pull from: arch(btw)
merge into: baobeld:master
Conversation 0 Commits 228 Files changed 270 +15 -70
2 changed files with 15 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 1106ae4dd6 - Show all commits

81
waybar/config.jsonc
View file

@ -7,74 +7,21 @@
"spacing": 4, // Gaps between modules (4px) "spacing": 4, // Gaps between modules (4px)
// Choose the order of the modules // Choose the order of the modules
"modules-left": [ "modules-left": [
"hyprland/workspaces" "hyprland/workspaces",
//"sway/scratchpad" "tray"
//"custom/media"
//"hyprland/window"
], ],
"modules-center": [ "modules-center": [
"clock" "custom/spotify"
], ],
"modules-right": [ "modules-right": [
//"mpd",
"tray",
"wireplumber", "wireplumber",
"network", "network",
"cpu", "cpu",
"memory", "memory",
"temperature", "temperature",
"idle_inhibitor" "idle_inhibitor",
"clock"
], ],
// Modules configuration
// "sway/workspaces": {
// "disable-scroll": true,
// "all-outputs": true,
// "warp-on-scroll": false,
// "format": "{name}: {icon}",
// "format-icons": {
// "1": "",
// "2": "",
// "3": "",
// "4": "",
// "5": "",
// "urgent": "",
// "focused": "",
// "default": ""
// }
// },
"sway/scratchpad": {
"format": "{icon} {count}",
"show-empty": false,
"format-icons": ["", ""],
"tooltip": true,
"tooltip-format": "{app}: {title}"
},
"mpd": {
"format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ⸨{songPosition}|{queueLength}⸩ {volume}% ",
"format-disconnected": "Disconnected ",
"format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ",
"unknown-tag": "N/A",
"interval": 2,
"consume-icons": {
"on": " "
},
"random-icons": {
"off": "<span color=\"#f53c3c\"></span> ",
"on": " "
},
"repeat-icons": {
"on": " "
},
"single-icons": {
"on": "1 "
},
"state-icons": {
"paused": "",
"playing": ""
},
"tooltip-format": "MPD (connected)",
"tooltip-format-disconnected": "MPD (disconnected)"
},
"idle_inhibitor": { "idle_inhibitor": {
"format": "{icon}", "format": "{icon}",
"format-icons": { "format-icons": {
@ -87,12 +34,12 @@
"spacing": 10 "spacing": 10
}, },
"clock": { "clock": {
// "timezone": "America/New_York", "timezone": "America/New_York",
"tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>", "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
"format-alt": "{:%Y-%m-%d}" "format-alt": "{:%Y-%m-%d}"
}, },
"cpu": { "cpu": {
"format": "{usage}% 󰻠", "format": "󰻠 {usage}%",
"tooltip": true "tooltip": true
}, },
"memory": { "memory": {
@ -103,7 +50,7 @@
// "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input", // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
"critical-threshold": 80, "critical-threshold": 80,
// "format-critical": "{temperatureC}°C {icon}", // "format-critical": "{temperatureC}°C {icon}",
"format": "{temperatureC}°C {icon}", "format": "{icon} {temperatureC}°C",
"format-icons": ["", "", ""] "format-icons": ["", "", ""]
}, },
"wireplumber": { "wireplumber": {
@ -112,24 +59,22 @@
}, },
"network": { "network": {
// "interface": "wlp2*", // (Optional) To force the use of this interface // "interface": "wlp2*", // (Optional) To force the use of this interface
"tooltip-format": "{essid} ({signalStrength}%)", "tooltip-format": "{essid}",
"format-wifi": "", "format-wifi": " {signalStrength}%",
"format-ethernet": "󰈀", "format-ethernet": "󰈀",
"format-linked": "{ifname} (No IP) ", "format-linked": "{ifname} (No IP) ",
"format-disconnected": "󰖪" "format-disconnected": "󰖪"
//"format-alt": "{ifname}: {ipaddr}/{cidr}" //"format-alt": "{ifname}: {ipaddr}/{cidr}"
}, },
"custom/media": { "custom/spotify": {
"format": "{icon} {}", "format": "{}",
"return-type": "json", "return-type": "json",
"max-length": 40, "max-length": 40,
"format-icons": { "format-icons": {
"spotify": "", "spotify": "",
"default": "🎜" "default": "🎜"
}, },
"escape": true, "exec": "/usr/bin/python3 $HOME/.config/waybar/modules/mediaplayer.py --player spotify" // Filter player based on name
"exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder
// "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name
} }
} }

4
waybar/modules/mediaplayer.py
View file

@ -124,9 +124,9 @@ class PlayerManager:
if track_info: if track_info:
if player.props.status == "Playing": if player.props.status == "Playing":
track_info = " " + track_info track_info = " " + track_info
else: else:
track_info = " " + track_info track_info = " " + track_info
# only print output if no other player is playing # only print output if no other player is playing
current_playing = self.get_first_playing_player() current_playing = self.get_first_playing_player()
if current_playing is None or current_playing.props.player_name == player.props.player_name: if current_playing is None or current_playing.props.player_name == player.props.player_name: