From 324357540d618c4e2da13f3d14d9806eeb43e332 Mon Sep 17 00:00:00 2001 From: Dennis Schoepf Date: Fri, 19 Dec 2025 00:58:14 +0100 Subject: [PATCH] configures waybar --- flake.nix | 4 --- home/linux.nix | 2 -- hosts/dnsc-machine/default.nix | 1 - modules/wm/niri/config/config.kdl | 2 -- modules/wm/waybar/config/config.jsonc | 37 ++++++++++++++++++++++--- modules/wm/waybar/config/power_menu.xml | 20 +++++++++++++ modules/wm/waybar/config/style.css | 28 +++++++++++++++++-- modules/wm/waybar/default.nix | 2 +- 8 files changed, 80 insertions(+), 16 deletions(-) create mode 100644 modules/wm/waybar/config/power_menu.xml diff --git a/flake.nix b/flake.nix index 1f930a3..2db518e 100644 --- a/flake.nix +++ b/flake.nix @@ -10,10 +10,6 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - ironbar = { - url = "github:JakeStanger/ironbar"; - inputs.nixpkgs.follows = "nixpkgs"; - }; nix-darwin.url = "github:LnL7/nix-darwin/master"; nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; ip-whitelist.url = "github:Oak-Digital/nixos-ip-whitelist-firewall"; diff --git a/home/linux.nix b/home/linux.nix index 9303a60..cc52cb5 100644 --- a/home/linux.nix +++ b/home/linux.nix @@ -39,7 +39,6 @@ krita gpustat librewolf - pamixer ]; imports = [ @@ -57,7 +56,6 @@ ../modules/wm/cliphist ../modules/wm/awww ../modules/wm/fuzzel - ../modules/wm/ironbar ../modules/wm/waybar ../modules/wm/niri ]; diff --git a/hosts/dnsc-machine/default.nix b/hosts/dnsc-machine/default.nix index 7a7001a..0bc92e9 100644 --- a/hosts/dnsc-machine/default.nix +++ b/hosts/dnsc-machine/default.nix @@ -63,7 +63,6 @@ dennis = { imports = [ inputs.zen-browser.homeModules.beta - inputs.ironbar.homeManagerModules.default ../../home/linux.nix ]; }; diff --git a/modules/wm/niri/config/config.kdl b/modules/wm/niri/config/config.kdl index c5c6b72..5559b8d 100644 --- a/modules/wm/niri/config/config.kdl +++ b/modules/wm/niri/config/config.kdl @@ -179,8 +179,6 @@ layout { // STARTUP spawn-at-startup "swaync" spawn-at-startup "swww-daemon" -spawn-at-startup "ironbar" -spawn-at-startup "blueman-applet" spawn-at-startup "tailscale systray" spawn-sh-at-startup "~/.config/awww/bin/random-bg.sh ~/Pictures/Wallpapers/safe/dark" diff --git a/modules/wm/waybar/config/config.jsonc b/modules/wm/waybar/config/config.jsonc index 962c66e..affafa0 100644 --- a/modules/wm/waybar/config/config.jsonc +++ b/modules/wm/waybar/config/config.jsonc @@ -21,8 +21,10 @@ "niri/workspaces" ], "modules-right": [ - "wireplumber", - "tray" + "wireplumber#source", + "wireplumber#sink", + "tray", + "custom/power" ], // Module Configuration "niri/workspaces": { @@ -66,9 +68,25 @@ "format": "{percentage_used}%", "max-length": 2 }, - "wireplumber": { - "on-click": "pamixer -t", + "wireplumber#source": { + "node-type": "Audio/Source", + "on-click": "wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle", "on-click-right": "pwvucontrol", + "scroll-step": 5.0, + "tooltip-format": "{node_name} ({source_volume}%)", + "format": "{icon}", + "format-muted": "󰍭", + "format-icons": { + "default": [ + "󰍬" + ] + } + }, + "wireplumber#sink": { + "on-click": "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle", + "on-click-right": "pwvucontrol", + "scroll-step": 5.0, + "tooltip-format": "{node_name} ({volume}%)", "format": "{icon}", "format-muted": "󰖁", "format-icons": { @@ -82,5 +100,16 @@ "tray": { "icon-size": 14, "spacing": 18 + }, + "custom/power": { + "format": "󰐥", + "tooltip": false, + "menu": "on-click", + "menu-file": "~/.config/waybar/power_menu.xml", + "menu-actions": { + "lock": "hyprlock", + "reboot": "reboot", + "shutdown": "shutdown" + } } } diff --git a/modules/wm/waybar/config/power_menu.xml b/modules/wm/waybar/config/power_menu.xml new file mode 100644 index 0000000..748ccb1 --- /dev/null +++ b/modules/wm/waybar/config/power_menu.xml @@ -0,0 +1,20 @@ + + + + + + Suspend + + + + + Hibernate + + + + + Shutdown + + + + diff --git a/modules/wm/waybar/config/style.css b/modules/wm/waybar/config/style.css index ee778be..9b03dbd 100644 --- a/modules/wm/waybar/config/style.css +++ b/modules/wm/waybar/config/style.css @@ -6,14 +6,26 @@ } tooltip, -#tray menu { +menu { background: rgba(15, 11, 12, 0.9); border-radius: 8px; border: 2px solid #572454; } +menuitem { + color: #ffffff; + margin-left: 4px; + margin-right: 4px; + border-radius: 4px; +} + +menuitem:hover { + color: #331531; + background-color: #c57faf; +} + window#waybar { - background-color: rgba(15, 11, 12, 0.999); + background-color: rgba(15, 11, 12, 0.95); border-radius: 8px; color: #ffffff; } @@ -50,11 +62,23 @@ window#waybar { #wireplumber { font-size: 16px; + margin-top: 4px; + margin-bottom: 4px; } #tray { margin: 4px; + margin-top: 0; border-radius: 4px; padding-top: 10px; padding-bottom: 10px; } + +#custom-power { + background-color: #331531; + font-size: 16px; + border-bottom-left-radius: 8px; + border-bottom-right-radius: 8px; + padding-top: 6px; + padding-bottom: 6px; +} diff --git a/modules/wm/waybar/default.nix b/modules/wm/waybar/default.nix index a03d35a..f8749ac 100644 --- a/modules/wm/waybar/default.nix +++ b/modules/wm/waybar/default.nix @@ -8,7 +8,7 @@ programs.waybar = { enable = true; systemd = { - enable = false; + enable = true; target = "graphical-session.target"; }; };