feat: refactor and add recording function on waybar
This commit is contained in:
danny
parent
47b5336149
commit
f3475c7d02
15 changed files with 656 additions and 586 deletions
|
|
@ -1,6 +1,6 @@
|
|||
configuration {
|
||||
show-icons: true;
|
||||
font: "FreeSans Regular 12";
|
||||
font: "JetBrainsMono 12";
|
||||
icon-theme: "Gruvbox-Plus-Dark";
|
||||
|
||||
display-ssh: " ssh:";
|
||||
|
|
|
|||
|
|
@ -1,173 +0,0 @@
|
|||
{
|
||||
terminal,
|
||||
osConfig,
|
||||
wallRand,
|
||||
rofiWall,
|
||||
pkgs,
|
||||
lib,
|
||||
}:
|
||||
let
|
||||
modulesConfig = import ./modules.nix {
|
||||
inherit
|
||||
terminal
|
||||
osConfig
|
||||
wallRand
|
||||
rofiWall
|
||||
pkgs
|
||||
lib
|
||||
;
|
||||
};
|
||||
in
|
||||
map (dev: dev // modulesConfig) [
|
||||
# Monitor 1
|
||||
{
|
||||
output = "DP-5";
|
||||
layer = "top";
|
||||
exclusive = true;
|
||||
passthrough = false;
|
||||
position = "top";
|
||||
fixed-center = true;
|
||||
ipc = true;
|
||||
margin-top = 0;
|
||||
margin-left = 0;
|
||||
margin-right = 0;
|
||||
margin-bottom = 0;
|
||||
modules-left = [
|
||||
"custom/os"
|
||||
"hyprland/workspaces"
|
||||
"clock"
|
||||
"custom/cava"
|
||||
"mpris"
|
||||
];
|
||||
modules-center = [
|
||||
"hyprland/window"
|
||||
];
|
||||
modules-right = (
|
||||
[
|
||||
"wlr/taskbar"
|
||||
]
|
||||
++ (
|
||||
if osConfig.programs.gamemode.enable then
|
||||
[
|
||||
"custom/gamemode"
|
||||
]
|
||||
else
|
||||
[ ]
|
||||
)
|
||||
++ [
|
||||
"custom/airplay"
|
||||
"custom/wallRand"
|
||||
"custom/wireguard"
|
||||
"idle_inhibitor"
|
||||
"network"
|
||||
"cpu"
|
||||
"memory"
|
||||
"pulseaudio"
|
||||
"custom/swaync"
|
||||
]
|
||||
);
|
||||
}
|
||||
# Monitor 2
|
||||
{
|
||||
output = "DP-6";
|
||||
layer = "top";
|
||||
exclusive = true;
|
||||
height = 54;
|
||||
passthrough = false;
|
||||
position = "top";
|
||||
fixed-center = true;
|
||||
ipc = true;
|
||||
margin-top = 0;
|
||||
margin-left = 0;
|
||||
margin-right = 0;
|
||||
margin-bottom = 0;
|
||||
modules-left = [
|
||||
"clock"
|
||||
"mpris"
|
||||
];
|
||||
modules-center = [
|
||||
"hyprland/window"
|
||||
];
|
||||
modules-right = [
|
||||
"wlr/taskbar"
|
||||
"temperature"
|
||||
"cpu"
|
||||
"memory"
|
||||
"pulseaudio"
|
||||
];
|
||||
}
|
||||
# Lap
|
||||
{
|
||||
output = "eDP-1";
|
||||
layer = "top";
|
||||
exclusive = true;
|
||||
passthrough = false;
|
||||
position = "top";
|
||||
fixed-center = true;
|
||||
ipc = true;
|
||||
margin-top = 0;
|
||||
margin-left = 0;
|
||||
margin-right = 0;
|
||||
margin-bottom = 0;
|
||||
modules-left = [
|
||||
"custom/os"
|
||||
"hyprland/workspaces"
|
||||
"clock"
|
||||
"mpris"
|
||||
];
|
||||
modules-center = [
|
||||
"hyprland/window"
|
||||
];
|
||||
modules-right = [
|
||||
"wlr/taskbar"
|
||||
"temperature"
|
||||
"custom/wallRand"
|
||||
"custom/wireguard"
|
||||
"idle_inhibitor"
|
||||
"network"
|
||||
"pulseaudio"
|
||||
"battery"
|
||||
"custom/swaync"
|
||||
];
|
||||
}
|
||||
# Other
|
||||
{
|
||||
output = [
|
||||
"!eDP-1"
|
||||
"!DP-1"
|
||||
"!DP-3"
|
||||
];
|
||||
layer = "top";
|
||||
exclusive = true;
|
||||
passthrough = false;
|
||||
position = "top";
|
||||
fixed-center = true;
|
||||
ipc = true;
|
||||
margin-top = 0;
|
||||
margin-left = 0;
|
||||
margin-right = 0;
|
||||
margin-bottom = 0;
|
||||
modules-left = [
|
||||
"custom/os"
|
||||
"hyprland/workspaces"
|
||||
"clock"
|
||||
"mpris"
|
||||
"custom/cava"
|
||||
];
|
||||
modules-center = [
|
||||
"hyprland/window"
|
||||
];
|
||||
modules-right = [
|
||||
"wlr/taskbar"
|
||||
"temperature"
|
||||
"custom/wireguard"
|
||||
"idle_inhibitor"
|
||||
"network"
|
||||
"cpu"
|
||||
"memory"
|
||||
"pulseaudio"
|
||||
"battery"
|
||||
"custom/swaync"
|
||||
];
|
||||
}
|
||||
]
|
||||
|
|
@ -1,314 +0,0 @@
|
|||
{
|
||||
terminal,
|
||||
osConfig,
|
||||
wallRand,
|
||||
pkgs,
|
||||
rofiWall,
|
||||
lib,
|
||||
}:
|
||||
let
|
||||
terminalRun = "${terminal} -e";
|
||||
in
|
||||
{
|
||||
"hyprland/workspaces" = {
|
||||
active-only = false;
|
||||
all-outputs = true;
|
||||
format = "{icon}";
|
||||
show-special = false;
|
||||
on-click = "activate";
|
||||
on-scroll-up = "hyprctl dispatch workspace e+1";
|
||||
on-scroll-down = "hyprctl dispatch workspace e-1";
|
||||
persistent-workspaces = {
|
||||
"1" = [ ];
|
||||
"2" = [ ];
|
||||
"3" = [ ];
|
||||
"4" = [ ];
|
||||
};
|
||||
format-icons = {
|
||||
active = "";
|
||||
default = "";
|
||||
};
|
||||
};
|
||||
clock = {
|
||||
format = "<b> {:%H:%M %d/%m}</b>";
|
||||
tooltip-format = "{:%A %d %B %Y}";
|
||||
};
|
||||
actions = {
|
||||
on-click-right = "mode";
|
||||
on-click-forward = "tz_up";
|
||||
on-click-backward = "tz_down";
|
||||
on-scroll-up = "shift_up";
|
||||
on-scroll-down = "shift_down";
|
||||
};
|
||||
"custom/os" = {
|
||||
format = "";
|
||||
on-click = "wlogout --protocol layer-shell";
|
||||
};
|
||||
cpu = {
|
||||
format = " {usage}%";
|
||||
max-length = 20;
|
||||
interval = 5;
|
||||
on-click-right = "${terminalRun} btop";
|
||||
};
|
||||
"hyprland/window" = {
|
||||
format = "{}";
|
||||
max-length = 40;
|
||||
separate-outputs = true;
|
||||
offscreen-css = true;
|
||||
offscreen-css-text = "(inactive)";
|
||||
rewrite = {
|
||||
"nvim . (.*)" = " $1";
|
||||
"(.*) - Visual Studio Code" = " $1";
|
||||
"\\(\\d+\\) Discord (.*)" = " $1";
|
||||
|
||||
# Firefox
|
||||
"(.*) - YouTube — Mozilla Firefox" = " $1";
|
||||
"(.*)\\.pdf — Mozilla Firefox" = " $1";
|
||||
"(.*) — Mozilla Firefox" = " $1";
|
||||
"(.*) - YouTube Music — Mozilla Firefox" = " $1";
|
||||
|
||||
# Firefox Nightly
|
||||
"(.*) - YouTube — Firefox Nightly" = " $1";
|
||||
"(.*)\\.pdf — Firefox Nightly" = " $1";
|
||||
"(.*) — Firefox Nightly" = " $1";
|
||||
"(.*) - YouTube Music — Firefox Nightly" = " $1";
|
||||
|
||||
# Zen
|
||||
"(.*) - YouTube — Zen Browser" = " $1";
|
||||
"(.*) - YouTube Music — Zen Browser" = " $1";
|
||||
"(.*) — Zen Browser" = " $1";
|
||||
|
||||
"(.*) - VLC media player" = " $1";
|
||||
};
|
||||
};
|
||||
memory = {
|
||||
interval = 30;
|
||||
format = " {used:0.1f}GB/{total:0.1f}G";
|
||||
format-alt-click = "click";
|
||||
tooltip = true;
|
||||
tooltip-format = "{used:0.1f}GB/{total:0.1f}G";
|
||||
on-click-right = "${terminalRun} btop";
|
||||
};
|
||||
mpris = {
|
||||
interval = 10;
|
||||
format = " {status_icon} <i>{title} | {artist} </i>";
|
||||
format-paused = " {status_icon} <i>{title} | {artist} </i>";
|
||||
on-click = "playerctl play-pause";
|
||||
on-click-right = "playerctl next";
|
||||
scroll-step = 5.0;
|
||||
smooth-scrolling-threshold = 1;
|
||||
status-icons = {
|
||||
paused = "";
|
||||
playing = "";
|
||||
stopped = "";
|
||||
};
|
||||
max-length = 30;
|
||||
};
|
||||
pulseaudio = {
|
||||
format = "{icon} {volume}%";
|
||||
format-bluetooth = " {volume}%";
|
||||
format-muted = " Muted";
|
||||
format-icons = {
|
||||
default = [
|
||||
""
|
||||
""
|
||||
" "
|
||||
" "
|
||||
];
|
||||
ignored-sinks = [
|
||||
"Easy Effects Sink"
|
||||
];
|
||||
};
|
||||
scroll-step = 5.0;
|
||||
on-click = "pavucontrol -t 3";
|
||||
tooltip-format = "{icon} {desc} | {volume}%";
|
||||
smooth-scrolling-threshold = 1;
|
||||
};
|
||||
temperature = {
|
||||
interval = 10;
|
||||
tooltip = true;
|
||||
hwmon-path = [
|
||||
"/sys/class/hwmon/hwmon1/temp1_input"
|
||||
"/sys/class/thermal/thermal_zone0/temp"
|
||||
];
|
||||
critical-threshold = 82;
|
||||
format-critical = " {temperatureC}°C";
|
||||
format = "{icon} {temperatureC}°C";
|
||||
format-icons = [
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
];
|
||||
on-click-right = "kitty -c ~/.config/kitty/kitty.conf --title btop sh -c 'btop'";
|
||||
};
|
||||
"custom/swaync" = {
|
||||
tooltip = true;
|
||||
format = "{icon}";
|
||||
format-icons = {
|
||||
notification = "";
|
||||
none = "";
|
||||
dnd-notification = "<span foreground='red'><sup></sup></span>";
|
||||
dnd-none = "";
|
||||
inhibited-notification = "<span foreground='red'><sup></sup></span>";
|
||||
inhibited-none = "";
|
||||
dnd-inhibited-notification = "<span foreground='red'><sup></sup></span>";
|
||||
dnd-inhibited-none = "";
|
||||
};
|
||||
return-type = "json";
|
||||
exec-if = "which swaync-client";
|
||||
exec = "swaync-client -swb";
|
||||
on-click = "sleep 0.1 && swaync-client -t -sw";
|
||||
on-click-right = "swaync-client -d -sw";
|
||||
escape = true;
|
||||
};
|
||||
"wlr/taskbar" = {
|
||||
format = " {icon} ";
|
||||
icon-size = 20;
|
||||
all-outputs = false;
|
||||
tooltip-format = "{title}";
|
||||
on-click = "activate";
|
||||
on-click-middle = "close";
|
||||
ignore-list = [
|
||||
"rofi"
|
||||
"firefox"
|
||||
"firefox-nightly"
|
||||
"zen"
|
||||
"kitty"
|
||||
"jetbrains-studio"
|
||||
"Brave-browser"
|
||||
"Spotify"
|
||||
"nemo"
|
||||
"vlc"
|
||||
"com.mitchellh.ghostty"
|
||||
"code"
|
||||
".virt-manager-wrapped"
|
||||
"virt-manager"
|
||||
];
|
||||
};
|
||||
"custom/cava" = {
|
||||
exec = "~/.config/scripts/waybarCava.sh";
|
||||
format = "{}";
|
||||
on-click = "${terminalRun} cava";
|
||||
};
|
||||
battery =
|
||||
let
|
||||
fullAt = if osConfig.services.tlp.enable then 80 else 96;
|
||||
in
|
||||
{
|
||||
full-at = fullAt;
|
||||
states = {
|
||||
good = fullAt;
|
||||
warning = 30;
|
||||
critical = 15;
|
||||
};
|
||||
format = "{icon} {capacity}%";
|
||||
format-icons = [
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
];
|
||||
format-charging = " {capacity}%";
|
||||
format-plugged = " {capacity}%";
|
||||
format-alt = "{icon} {time}";
|
||||
};
|
||||
network = {
|
||||
format = "{ifname}";
|
||||
format-wifi = "";
|
||||
format-ethernet = "";
|
||||
format-disconnected = "";
|
||||
tooltip-format = "{ifname} via {gwaddr} ";
|
||||
tooltip-format-wifi = " {essid}: {signalStrength}%";
|
||||
tooltip-format-ethernet = "{ifname} via {gwaddr} ";
|
||||
tooltip-format-disconnected = "Disconnected";
|
||||
max-length = 50;
|
||||
interval = 5;
|
||||
on-click = "~/.config/scripts/rofiWifi.sh";
|
||||
};
|
||||
idle_inhibitor = {
|
||||
format = "{icon}";
|
||||
format-icons = {
|
||||
activated = "";
|
||||
deactivated = "";
|
||||
};
|
||||
};
|
||||
"custom/wireguard" = {
|
||||
format = "{icon}";
|
||||
format-icons = {
|
||||
connected = "";
|
||||
disconnected = "";
|
||||
};
|
||||
exec = "~/.config/scripts/wgStatus.sh";
|
||||
exec-if = "which wg-quick";
|
||||
on-click = "~/.config/scripts/wgStatus.sh toggle";
|
||||
tooltip = true;
|
||||
interval = 3;
|
||||
return-type = "json";
|
||||
escape = true;
|
||||
};
|
||||
"custom/gamemode" = {
|
||||
format = "{icon}";
|
||||
format-icons = {
|
||||
active = "";
|
||||
inactive = "";
|
||||
};
|
||||
exec = "~/.config/scripts/gamemodeStatus.sh";
|
||||
on-click = "~/.config/scripts/gamemodeStatus.sh toggle";
|
||||
tooltip = true;
|
||||
interval = 3;
|
||||
return-type = "json";
|
||||
escape = true;
|
||||
};
|
||||
"custom/wallRand" = {
|
||||
format = "";
|
||||
on-click = "${rofiWall}";
|
||||
on-click-right = "${wallRand}";
|
||||
};
|
||||
"custom/airplay" =
|
||||
let
|
||||
toggleScript = pkgs.writeShellScript "airplayStatus" ''
|
||||
SERVICE="uxplay"
|
||||
ICON=""
|
||||
|
||||
if [ "$1" = "toggle" ]; then
|
||||
if systemctl --user is-active --quiet "$SERVICE"; then
|
||||
systemctl --user stop "$SERVICE"
|
||||
notify-send "$ICON Airplay" "off" >/dev/null 2>&1
|
||||
else
|
||||
systemctl --user start "$SERVICE"
|
||||
notify-send "$ICON Airplay" "on" >/dev/null 2>&1
|
||||
fi
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if ! systemctl --user is-active --quiet "$SERVICE"; then
|
||||
echo "{\"text\": \"inactive\", \"tooltip\": \"airplay is inactive\", \"alt\": \"inactive\", \"class\": \"inactive\"}"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
echo "{\"text\": \"active\", \"tooltip\": \"airplay is running\", \"alt\": \"active\", \"class\": \"active\"}"
|
||||
exit 0
|
||||
'';
|
||||
in
|
||||
{
|
||||
format = "{icon}";
|
||||
format-icons = {
|
||||
active = "";
|
||||
inactive = "";
|
||||
};
|
||||
exec = toggleScript;
|
||||
interval = 3;
|
||||
tooltip = true;
|
||||
return-type = "json";
|
||||
escape = true;
|
||||
on-click = "${toggleScript} toggle";
|
||||
};
|
||||
}
|
||||
|
|
@ -46,6 +46,8 @@ tooltip label {
|
|||
#custom-gamemode,
|
||||
#custom-wallRand,
|
||||
#custom-airplay,
|
||||
#custom-bitwarden,
|
||||
#custom-recording,
|
||||
#clock,
|
||||
#cpu,
|
||||
#memory,
|
||||
|
|
@ -86,6 +88,8 @@ tooltip label {
|
|||
#custom-gamemode,
|
||||
#custom-wallRand,
|
||||
#custom-airplay,
|
||||
#custom-bitwarden,
|
||||
#custom-recording,
|
||||
#battery {
|
||||
margin-left: 4px;
|
||||
}
|
||||
|
|
@ -135,6 +139,8 @@ tooltip label {
|
|||
#custom-gamemode,
|
||||
#custom-wallRand,
|
||||
#custom-airplay,
|
||||
#custom-bitwarden,
|
||||
#custom-recording,
|
||||
#network,
|
||||
#idle_inhibitor {
|
||||
padding-left: 10px; padding-right: 14px;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue