added remmina, changes in niri
This commit is contained in:
@ -2,16 +2,57 @@
|
||||
"layer": "top",
|
||||
"position": "bottom",
|
||||
"height": 16,
|
||||
"modules-left": ["niri/workspaces", "niri/window"],
|
||||
"modules-center": ["custom/media"],
|
||||
"modules-right": ["tray", "niri/language", "network", "custom/tscale", "pulseaudio", "clock", "custom/quit"],
|
||||
"modules-left": ["group/workspace"],
|
||||
"modules-center": [],
|
||||
"modules-right": ["group/media", "tray", "niri/language", "group/net", "pulseaudio", "privacy", "clock", "custom/quit"],
|
||||
"clock": {
|
||||
"format": "{:%H:%M}",
|
||||
"format-alt": "{:%a %b %d}",
|
||||
"tooltip": false
|
||||
},
|
||||
"tray": {
|
||||
"spacing": 10
|
||||
"spacing": 10
|
||||
},
|
||||
"custom/musicplay": {
|
||||
"format": "{}",
|
||||
"interval": 1,
|
||||
"exec": "$HOME/.config/waybar/get_media.sh play",
|
||||
"max-length": 40,
|
||||
"on-click": "playerctl play-pause"
|
||||
},
|
||||
"custom/musicnext": {
|
||||
"format": "{}",
|
||||
"exec": "$HOME/.config/waybar/get_media.sh next",
|
||||
"max-length": 40,
|
||||
"on-click": "playerctl next"
|
||||
},
|
||||
"custom/musicprev": {
|
||||
"format": "{}",
|
||||
"exec": "$HOME/.config/waybar/get_media.sh prev",
|
||||
"max-length": 40,
|
||||
"on-click": "playerctl previous"
|
||||
},
|
||||
"custom/musicname": {
|
||||
"format": "{}",
|
||||
"interval": 1,
|
||||
"exec": "$HOME/.config/waybar/get_media.sh name",
|
||||
"max-length": 40,
|
||||
},
|
||||
"group/media": {
|
||||
"orientation": "inherit",
|
||||
"drawer": {
|
||||
"transition-duration": 200,
|
||||
"children-class": "not-med"
|
||||
},
|
||||
"modules": [
|
||||
"custom/musicplay", "custom/musicprev", "custom/musicname", "custom/musicnext"
|
||||
]
|
||||
},
|
||||
"custom/tscale": {
|
||||
"interval": 5,
|
||||
"exec": "~/.config/waybar/tscale",
|
||||
"return-type": "json",
|
||||
"on-click": "~/.dotfiles/bin/fuzzel-tscale"
|
||||
},
|
||||
"network": {
|
||||
"format": "{ifname}",
|
||||
@ -21,27 +62,40 @@
|
||||
"tooltip-format-wifi": "{signalStrength}%",
|
||||
"max-length": 20
|
||||
},
|
||||
"custom/media": {
|
||||
"format": "{}",
|
||||
"interval": 1,
|
||||
"exec": "$HOME/.config/waybar/get_media.sh",
|
||||
"max-length": 60,
|
||||
"on-click": "playerctl play-pause"
|
||||
},
|
||||
"custom/tscale": {
|
||||
"interval": 5,
|
||||
"exec": "~/.config/waybar/tscale",
|
||||
"return-type": "json",
|
||||
"on-click": "~/.dotfiles/bin/fuzzel-tscale"
|
||||
},
|
||||
"custom/keyboard": {
|
||||
"format": " {}",
|
||||
"interval": 1,
|
||||
"exec": "$HOME/.config/waybar/get_kbdlayout.sh"
|
||||
},
|
||||
"group/net": {
|
||||
"orientation": "inherit",
|
||||
"drawer": {
|
||||
"transition-duration": 200,
|
||||
"children-class": "not-net"
|
||||
},
|
||||
"modules": [
|
||||
"network", "custom/tscale"
|
||||
]
|
||||
},
|
||||
|
||||
"group/workspace": {
|
||||
"orientation": "inherit",
|
||||
"drawer": {
|
||||
"transition-duration": 200,
|
||||
"children-class": "workspace"
|
||||
},
|
||||
"modules": ["niri/workspaces", "wlr/taskbar"]
|
||||
},
|
||||
"niri/language": {
|
||||
"format": "{short}"
|
||||
},
|
||||
"wlr/taskbar": {
|
||||
"format": "{icon}",
|
||||
"icon-theme": "Papirus",
|
||||
//"all-outputs": true,
|
||||
"on-click": "activate",
|
||||
"on-click-middle": "close"
|
||||
},
|
||||
|
||||
"pulseaudio": {
|
||||
"format": "{icon} {volume}%",
|
||||
|
||||
@ -1,15 +1,28 @@
|
||||
media=$(playerctl metadata -f "({{playerName}}) {{artist}} - {{title}}" 2>/dev/null)
|
||||
#!/usr/bin/env bash
|
||||
|
||||
media=$(playerctl metadata -f "{{artist}} - {{title}}")
|
||||
player_status=$(playerctl status)
|
||||
|
||||
if [[ $player_status = "Playing" ]]
|
||||
then
|
||||
song_status=''
|
||||
elif [[ $player_status = "Paused" ]]
|
||||
then
|
||||
song_status=''
|
||||
else
|
||||
song_status=''
|
||||
fi
|
||||
|
||||
[ -z "$media" ] && echo -e "$song_status"
|
||||
[ ! -z "$media" ] && echo -e "$song_status $media"
|
||||
case "$1" in
|
||||
"name")
|
||||
[ -z "$media" ] || echo -e "$media"
|
||||
;;
|
||||
"play")
|
||||
if [[ "$player_status" = "Playing" ]]
|
||||
then
|
||||
echo -e ''
|
||||
elif [[ "$player_status" = "Paused" ]]
|
||||
then
|
||||
echo -e ''
|
||||
else
|
||||
exit
|
||||
fi
|
||||
;;
|
||||
"next")
|
||||
[ "$player_status" = "Stopped" ] || echo -e ""
|
||||
;;
|
||||
"prev")
|
||||
[ "$player_status" = "Stopped" ] || echo -e ""
|
||||
;;
|
||||
esac
|
||||
|
||||
@ -74,14 +74,19 @@ window#waybar {
|
||||
color: #c5ffc6;
|
||||
}
|
||||
|
||||
#workspace {
|
||||
margin: 3px;
|
||||
border: 1px solid @cl_border;
|
||||
}
|
||||
|
||||
#workspaces {
|
||||
background: @bg_block;
|
||||
color: @fg_main;
|
||||
margin: 3px 0px 3px 3px;
|
||||
border-top: 1px solid @cl_border;
|
||||
border-bottom: 1px solid @cl_border;
|
||||
border-left: 1px solid @cl_border;
|
||||
/* margin: 3px 0px 3px 3px; */
|
||||
/* border-top: 1px solid @cl_border; */
|
||||
/* border-bottom: 1px solid @cl_border; */
|
||||
/* border-left: 1px solid @cl_border; */
|
||||
/* border-right: 1px solid @cl_border; */
|
||||
}
|
||||
|
||||
#workspaces button {
|
||||
@ -102,6 +107,7 @@ window#waybar {
|
||||
border-top: 1px solid @cl_border;
|
||||
border-bottom: 1px solid @cl_border;
|
||||
border-right: 1px solid @cl_border;
|
||||
border-left: none;
|
||||
}
|
||||
window#waybar.empty #window {
|
||||
background-color: transparent;
|
||||
@ -116,7 +122,39 @@ window#waybar.empty #window {
|
||||
border: 1px solid @cl_border;
|
||||
}
|
||||
|
||||
#custom-media {
|
||||
#taskbar {
|
||||
background: @bg_block;
|
||||
color: @fg_main;
|
||||
/* margin: 3px 3px 3px 0px; */
|
||||
padding: 0;
|
||||
border-left: none;
|
||||
border-right: none;
|
||||
}
|
||||
|
||||
|
||||
#taskbar button {
|
||||
padding: 3px;
|
||||
padding-left: 7px;
|
||||
margin: 0px;
|
||||
border-radius: 0;
|
||||
border-top: 0px;
|
||||
border-bottom: 0px;
|
||||
border-left: 0px;
|
||||
border-right: 0px;
|
||||
}
|
||||
#taskbar button.active {
|
||||
background-color: #606060;
|
||||
}
|
||||
|
||||
|
||||
#privacy {
|
||||
margin: 3px 3px 3px 3px;
|
||||
padding: 5px 7px 5px 7px;
|
||||
background-color: @bg_block;
|
||||
border: 1px solid @cl_border;
|
||||
}
|
||||
|
||||
#media {
|
||||
margin: 3px;
|
||||
padding: 5px 7px 5px 7px;
|
||||
background: @bg_block;
|
||||
@ -126,6 +164,11 @@ window#waybar.empty #window {
|
||||
border-left: 1px solid @cl_border;
|
||||
border-right: 1px solid @cl_border;
|
||||
}
|
||||
|
||||
#media * {
|
||||
margin: 0 3px;
|
||||
padding: 0 4px;
|
||||
}
|
||||
#pulseaudio {
|
||||
margin: 3px 3px 3px 0px;
|
||||
padding: 5px 7px 5px 5px;
|
||||
@ -145,3 +188,5 @@ window#waybar.empty #window {
|
||||
border-left: 0px solid rgba(0,0,0,0);
|
||||
padding: 5px;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user