waybar: use catppuccin module, add GTK theme
Switch waybar from manual fetchFromGitHub theme to catppuccin/nix module. Add catppuccin macchiato GTK theme to fix unreadable tray context menus. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -24,15 +24,9 @@ in
|
||||
sops.secrets."radarr_base_url" = { };
|
||||
sops.secrets."radarr_api_key" = { };
|
||||
|
||||
xdg.configFile."waybar/macchiato.css" = {
|
||||
source =
|
||||
pkgs.fetchFromGitHub {
|
||||
owner = "catppuccin";
|
||||
repo = "waybar";
|
||||
rev = "f74ab1eecf2dcaf22569b396eed53b2b2fbe8aff";
|
||||
sha256 = "WLJMA2X20E5PCPg0ZPtSop0bfmu+pLImP9t8A8V4QK8=";
|
||||
}
|
||||
+ "/themes/macchiato.css";
|
||||
catppuccin.waybar = {
|
||||
enable = true;
|
||||
flavor = "macchiato";
|
||||
};
|
||||
|
||||
programs.waybar = {
|
||||
@@ -42,7 +36,6 @@ in
|
||||
target = "graphical-session.target";
|
||||
};
|
||||
style = ''
|
||||
@import "macchiato.css";
|
||||
* {
|
||||
border: none;
|
||||
font-family: "JetbrainsMono Nerd Font";
|
||||
@@ -137,6 +130,7 @@ in
|
||||
#pulseaudio,
|
||||
#network,
|
||||
#battery,
|
||||
#disk,
|
||||
#custom-powermenu,
|
||||
#custom-arrhist {
|
||||
padding-left: 12px;
|
||||
@@ -164,6 +158,7 @@ in
|
||||
(lib.mkIf (withArrhist) "custom/arrhist")
|
||||
"pulseaudio"
|
||||
"pulseaudio#microphone"
|
||||
"disk"
|
||||
"memory"
|
||||
"cpu"
|
||||
(lib.mkIf (withBattery) "battery")
|
||||
@@ -217,6 +212,15 @@ in
|
||||
"interval" = 3;
|
||||
"format" = " {usage}%";
|
||||
};
|
||||
"disk" = {
|
||||
"interval" = 30;
|
||||
"format" = " {percentage_used}%";
|
||||
"path" = "/";
|
||||
"tooltip-format" = "{used} / {total}";
|
||||
"states" = {
|
||||
"warning" = 85;
|
||||
};
|
||||
};
|
||||
"tray" = {
|
||||
"icon-size" = 15;
|
||||
"spacing" = 6;
|
||||
|
||||
Reference in New Issue
Block a user