Styling updates: Moved waybar to side of screen

Module/style tweaks to fix vertical form-factor, mostly moving text
into tooltips and adjusting padding/margin values.

Set pulseaudio module to use fuzzel interface.

Tweaked opacity values.

Make all floating windows have border size 2 for consistency.
This commit is contained in:
Evie Litherland-Smith 2024-12-20 08:41:40 +00:00
parent ee21fdc6ca
commit af96fd456d
4 changed files with 61 additions and 77 deletions

View file

@ -204,10 +204,10 @@
image = ./wallpapers/tropic_island_day.jpg; image = ./wallpapers/tropic_island_day.jpg;
base16Scheme = "${pkgs.base16-schemes}/share/themes/one-light.yaml"; base16Scheme = "${pkgs.base16-schemes}/share/themes/one-light.yaml";
opacity = { opacity = {
applications = 1.0; applications = 0.9;
desktop = 0.8; desktop = 0.7;
popups = 0.4; popups = 0.5;
terminal = 0.8; terminal = 0.9;
}; };
cursor = { cursor = {
package = pkgs.volantes-cursors; package = pkgs.volantes-cursors;

View file

@ -4,15 +4,14 @@
enable = true; enable = true;
settings = { settings = {
main = { main = {
use-bold = true;
icon-theme = config.gtk.iconTheme.name; icon-theme = config.gtk.iconTheme.name;
icons-enabled = true; icons-enabled = true;
fields = "filename,name,generic,categories"; fields = "filename,name,generic,exec";
fuzzy = true; fuzzy = true;
filter-desktop = true; filter-desktop = true;
terminal = "${config.programs.alacritty.package}/bin/alacritty -e"; terminal = "${config.programs.alacritty.package}/bin/alacritty -e";
lines = 24; anchor = "center";
width = 40;
tabs = 4;
layer = "overlay"; layer = "overlay";
}; };
border = { border = {

View file

@ -11,7 +11,7 @@
icons = true; icons = true;
iconPath = with config.gtk.iconTheme; "${package}/share/icons/${name}"; iconPath = with config.gtk.iconTheme; "${package}/share/icons/${name}";
borderRadius = 10; borderRadius = 10;
borderSize = 1; borderSize = 2;
borderColor = lib.mkForce config.lib.stylix.scheme.withHashtag.base0E; borderColor = lib.mkForce config.lib.stylix.scheme.withHashtag.base0E;
defaultTimeout = (builtins.mul 5 1000); # 5s timeout defaultTimeout = (builtins.mul 5 1000); # 5s timeout
}; };

View file

@ -1,5 +1,6 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = [ ./avizo.nix ];
stylix.targets.waybar.enable = false; stylix.targets.waybar.enable = false;
systemd.user.targets.tray.Unit = { systemd.user.targets.tray.Unit = {
Description = "Home Manager System Tray"; Description = "Home Manager System Tray";
@ -12,13 +13,13 @@
settings.main = { settings.main = {
name = "main"; name = "main";
layer = "top"; layer = "top";
position = "top"; position = "left";
# Layout # Layout
"modules-left" = [ "modules-left" = [
"hyprland/workspaces" "hyprland/workspaces"
"hyprland/window" "mpris"
]; ];
"modules-center" = [ "mpris" ]; "modules-center" = [ ];
"modules-right" = [ "modules-right" = [
"custom/notification" "custom/notification"
"pulseaudio" "pulseaudio"
@ -26,7 +27,6 @@
"bluetooth" "bluetooth"
"clock#calendar" "clock#calendar"
"clock" "clock"
"keyboard-state"
"backlight" "backlight"
"battery" "battery"
"custom/weather" "custom/weather"
@ -87,9 +87,8 @@
}; };
}; };
mpris = { mpris = {
"format" = "{player_icon} {status_icon} | {album} - {artist} - {title}"; "format" = "{player_icon}\n{status_icon}";
"tooltip-format" = "{player_icon} ({player}) {status_icon} {dynamic}"; "tooltip-format" = "{player_icon} ({player}) {status_icon}\n{title}\n{album}\n{artist}";
"title-len" = 64;
"interval" = 1; "interval" = 1;
"dynamic-order" = [ "dynamic-order" = [
"album" "album"
@ -110,8 +109,8 @@
}; };
pulseaudio = { pulseaudio = {
scroll-step = 5; scroll-step = 5;
format = "{format_source} {icon} {volume}%"; format = "{format_source}\n{icon}";
format-muted = "{format_source} 󰝟"; # format-muted = "{format_source} {icon}";
format-source = "󰍬"; format-source = "󰍬";
format-source-muted = "󰍭"; format-source-muted = "󰍭";
format-icons = { format-icons = {
@ -121,36 +120,19 @@
"󰖀" "󰖀"
"󰕾" "󰕾"
]; ];
default-muted = "󰝟";
hands-free = "󰥰"; hands-free = "󰥰";
headset = "󰋎"; headset = "󰋎";
phone = "󰏲"; phone = "󰏲";
portable = "󰏳"; portable = "󰏳";
headphone = "󰋋"; headphone = "󰋋";
}; };
tooltip = true;
tooltip-format = "{desc} ({volume}%)";
on-click = "${pkgs.pavucontrol}/bin/pavucontrol"; on-click = "${pkgs.pavucontrol}/bin/pavucontrol";
on-click-right = "${pkgs.pamixer}/bin/pamixer -t"; on-click-right = "${config.services.avizo.package}/bin/volumectl %";
on-scroll-up = "${pkgs.pamixer}/bin/pamixer -i 5"; on-scroll-up = "${config.services.avizo.package}/bin/volumectl -u + 5";
on-scroll-down = "${pkgs.pamixer}/bin/pamixer -d 5"; on-scroll-down = "${config.services.avizo.package}/bin/volumectl -u - 5";
};
disk = {
format = "󰋊 {percentage_used}%";
path = config.home.homeDirectory;
};
cpu = {
format = "󰻠 {usage}%";
tooltip = false;
};
memory = {
format = "󰍛 {}%";
};
temperature = {
critical-threshold = 80;
format = "{icon} {temperatureC}°C";
format-icons = [
"󱃃"
"󰔏"
"󱃂"
];
}; };
network = { network = {
format-icons = [ format-icons = [
@ -180,7 +162,7 @@
size = "${toString config.stylix.fonts.sizes.popups}pt"; size = "${toString config.stylix.fonts.sizes.popups}pt";
in in
{ {
format = "󰃭 {:%Y-%m-%d}"; format = "󰃭";
tooltip-format = "<span size='${size}'>{calendar}</span>"; tooltip-format = "<span size='${size}'>{calendar}</span>";
calendar = { calendar = {
mode = "month"; mode = "month";
@ -203,14 +185,9 @@
on-scroll-down = "shift_down"; on-scroll-down = "shift_down";
}; };
}; };
clock.format = "󰥔 {:%R}"; clock = {
"keyboard-state" = { format = "{:%H\n%M}";
capslock = true; tooltip = false;
format.capslock = "󰪛 :{icon}";
format-icons = {
locked = "󰌾";
unlocked = "󰌿";
};
}; };
backlight = { backlight = {
format = "{icon}"; format = "{icon}";
@ -234,10 +211,10 @@
}; };
format = "{icon}"; format = "{icon}";
format-time = "{H}:{m}"; format-time = "{H}:{m}";
format-charging = "󰂄 ({time})"; format-charging = "󰂄";
format-plugged = "󰚥"; format-plugged = "󰚥";
format-warning = "{icon}{capacity}%"; # format-warning = "{icon}{capacity}%";
format-critical = "{icon}{capacity}% ({time})"; # format-critical = "{icon}{capacity}% ({time})";
tooltip-format = "{capacity}% | {power}W | {time}"; tooltip-format = "{capacity}% | {power}W | {time}";
format-icons = [ format-icons = [
"󱃍" "󱃍"
@ -254,9 +231,10 @@
]; ];
}; };
"systemd-failed-units" = { "systemd-failed-units" = {
hide-on-ok = false; hide-on-ok = true;
format = "󰀦 S:{nr_failed_system} U:{nr_failed_user}"; format = "󰀦";
format-ok = "󰄬 "; tooltip = true;
tooltip-format = "System failed:{nr_failed_system} User failed:{nr_failed_user}";
system = true; system = true;
user = true; user = true;
}; };
@ -268,13 +246,14 @@
{ {
exec = "( ${makoctl} list | ${jq} -e '.data[] | length > 0' >/dev/null && echo '󱅫' ) || echo '󰂚' "; exec = "( ${makoctl} list | ${jq} -e '.data[] | length > 0' >/dev/null && echo '󱅫' ) || echo '󰂚' ";
format = "{}"; format = "{}";
tooltip = false;
on-click = "${makoctl} dismiss -a"; on-click = "${makoctl} dismiss -a";
interval = 3; interval = 3;
}; };
"custom/weather" = "custom/weather" =
let let
date-format = "%Y-%m-%d"; date-format = "%Y-%m-%d";
custom-indicator = "{ICON}{temp_C}°C({FeelsLikeC}°C)"; custom-indicator = "{ICON}"; # "{temp_C}°C({FeelsLikeC}°C)";
in in
{ {
format = "{}"; format = "{}";
@ -298,7 +277,7 @@
* { * {
all: unset; all: unset;
font-family: ${config.stylix.fonts.monospace.name}; font-family: ${config.stylix.fonts.monospace.name};
font-size: ${toString config.stylix.fonts.sizes.popups}px; font-size: ${toString (config.stylix.fonts.sizes.desktop + 2)}px;
} }
window { window {
@ -310,17 +289,18 @@
window > box { window > box {
color: ${scheme.base05}; color: ${scheme.base05};
background: alpha(${scheme.base00}, ${toString opacity}); background: alpha(${scheme.base00}, ${toString opacity});
margin: 5px 5px 0px; margin: 5px 0px 5px 5px;
padding: 0px; padding: 2px;
border: 1px solid ${scheme.base04}; border: 1px solid ${scheme.base04};
border-radius: 10px; border-radius: 10px;
} }
tooltip { tooltip {
background: ${scheme.base00}; background: ${scheme.base00};
border: 1px solid ${scheme.base0E}; border: 2px solid ${scheme.base0E};
border-radius: 10px; border-radius: 10px;
box-shadow: none; box-shadow: none;
padding: 10px;
} }
tooltip label { tooltip label {
@ -338,29 +318,23 @@
#network, #network,
#bluetooth, #bluetooth,
#clock, #clock,
#keyboard-state,
#backlight, #backlight,
#battery, #battery,
#custom-weather, #custom-weather,
#tray { #tray {
margin: 0px; margin: 0px;
padding: 1px 5px; padding: 2px 4px 2px 3px;
} }
#workspaces, #workspaces {
#window, background: ${scheme.base00};
#tray, border-radius: 5px;
#backlight, margin: 3px 2px;
#battery, padding: 2px 3px;
#custom-weather {
color: ${scheme.base05};
} }
#workspaces button { #workspaces button {
background: transparent; padding: 2px 5px 2px 0px;
color: ${scheme.base05};
margin: 0px;
padding: 0px 5px;
} }
#workspaces button.empty { #workspaces button.empty {
color: ${scheme.base03}; color: ${scheme.base03};
@ -384,20 +358,23 @@
} }
#network { #network {
color: ${scheme.base0A}; color: ${scheme.base0A};
padding: 2px 6px 2px 1px;
} }
#bluetooth { #bluetooth {
color: ${scheme.base0B}; color: ${scheme.base0B};
} }
#clock.calendar { #clock.calendar {
color: ${scheme.base0C}; color: ${scheme.base0C};
padding: 2px 4px 2px 2px;
} }
#clock { #clock {
color: ${scheme.base0D}; color: ${scheme.base0D};
} padding: 2px 1px 2px 2px;
#keyboard-state {
color: ${scheme.base0E};
} }
#backlight {
padding: 2px 6px 2px 0px;
}
#battery.warning { #battery.warning {
color: ${scheme.base09}; color: ${scheme.base09};
} }
@ -409,12 +386,20 @@
color: ${scheme.base0B}; color: ${scheme.base0B};
} }
#systemd-failed-units {
padding: 2px 5px 2px 0px;
}
#systemd-failed-units.ok { #systemd-failed-units.ok {
color: ${scheme.base0B} color: ${scheme.base0B}
} }
#systemd-failed-units.degraded { #systemd-failed-units.degraded {
color: ${scheme.base08} color: ${scheme.base08}
} }
#custom-weather,
#tray {
padding: 2px 2px 2px 3px;
}
''; '';
}; };
} }