This commit is contained in:
암냥 2026-09-12 03:47:58 +09:00
commit 1ab0263e27
3 changed files with 45 additions and 60 deletions

View file

@ -15,7 +15,7 @@ let
hyprlandConfig = ''
source = colors.conf
monitor = eDP-1, 1920x1080@60, 0x0, 1
monitor = , preferred, auto, 1
$terminal = ${pkgs.ghostty}/bin/ghostty
$fileManager = ${pkgs.nautilus}/bin/nautilus
@ -138,48 +138,34 @@ let
bindl = , XF86AudioPrev, exec, ${pkgs.playerctl}/bin/playerctl previous
'';
# ponytail: keep the upstream core rice only; add Matugen/extra Waybar modules when needed.
waybarConfig = builtins.toJSON {
layer = "top";
position = "top";
spacing = 3;
margin-top = 3;
margin-left = 8;
margin-right = 8;
modules-left = [ "clock" "tray" ];
modules-center = [ "hyprland/workspaces" ];
modules-right = [ "network" "pulseaudio" "battery" "custom/power" ];
clock = {
interval = 1;
format = " {:%I:%M %p}";
format-alt = " {:%H:%M %Y, %d %B, %A}";
tooltip-format = "<tt><small>{calendar}</small></tt>";
};
network = {
format-wifi = " {essid}";
format-ethernet = "󰈀 {ifname}";
format-disconnected = "󰤮";
tooltip-format = "{ifname}: {ipaddr}/{cidr}";
};
pulseaudio = {
format = "{icon} {volume}%";
format-muted = "󰖁 muted";
format-icons = [ "" "" "" ];
on-click = "${pkgs.wireplumber}/bin/wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
};
battery = {
states = { warning = 30; critical = 15; };
format = "{icon} {capacity}%";
format-charging = " {capacity}%";
format-icons = [ "󰂎" "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹" ];
};
"custom/power" = {
format = "";
on-click = "${pkgs.wlogout}/bin/wlogout";
tooltip = true;
tooltip-format = "Logout Menu";
};
};
# ponytail: use the upstream visual composition; only remove its personal include.
fixWaybarPaths = text:
builtins.replaceStrings
[
"$HOME/.config/hypr/scripts/volume.sh --inc"
"$HOME/.config/hypr/scripts/volume.sh --dec"
"$HOME/.config/hypr/scripts/volume.sh --toggle-mic"
"$HOME/.config/hypr/scripts/volume.sh --toggle"
"$HOME/.config/hypr/scripts/volume.sh --mic-inc"
"$HOME/.config/hypr/scripts/volume.sh --mic-dec"
"$HOME/.config/hypr/scripts/Wlogout.sh"
]
[
"${pkgs.wireplumber}/bin/wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+"
"${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
"${pkgs.wireplumber}/bin/wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"
"${pkgs.wireplumber}/bin/wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
"${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_AUDIO_SOURCE@ 5%+"
"${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_AUDIO_SOURCE@ 5%-"
"${pkgs.wlogout}/bin/wlogout"
]
text;
waybarConfig = builtins.replaceStrings
[ " \"$HOME/.config/waybar/UserModules\",\n" ]
[ "" ]
(builtins.readFile "${upstream}/waybar/configs/bintang default");
waybarModules = fixWaybarPaths (builtins.readFile "${upstream}/waybar/Modules");
waybarCustomModules = fixWaybarPaths (builtins.readFile "${upstream}/waybar/ModulesCustom");
in
{
home.packages = with pkgs; [
@ -191,6 +177,7 @@ in
libnotify
nautilus
networkmanagerapplet
pavucontrol
playerctl
rofi
slurp
@ -218,6 +205,10 @@ in
"hypr/hypridle.conf".source = "${upstream}/hypr/hypridle.conf";
"hypr/hyprlock.conf".source = "${upstream}/hypr/hyprlock.conf";
"waybar/config".text = waybarConfig;
"waybar/Modules".text = waybarModules;
"waybar/ModulesCustom".text = waybarCustomModules;
"waybar/ModulesGroups".source = "${upstream}/waybar/ModulesGroups";
"waybar/ModulesWorkspaces".source = "${upstream}/waybar/ModulesWorkspaces";
"waybar/colors.css".source = "${upstream}/waybar/colors.css";
"waybar/style.css".source = "${upstream}/waybar/style/bintang default.css";
"wlogout/layout".text = ''