1

Waybar: Use colors from color HM module

This commit is contained in:
2024-10-13 17:54:03 +02:00
parent e46b774049
commit bebd70ba82
3 changed files with 78 additions and 127 deletions

View File

@ -1,37 +0,0 @@
/*
*
* Catppuccin Latte palette
* Maintainer: rubyowo
*
*/
@define-color base #eff1f5;
@define-color mantle #e6e9ef;
@define-color crust #dce0e8;
@define-color text #4c4f69;
@define-color subtext0 #6c6f85;
@define-color subtext1 #5c5f77;
@define-color surface0 #ccd0da;
@define-color surface1 #bcc0cc;
@define-color surface2 #acb0be;
@define-color overlay0 #9ca0b0;
@define-color overlay1 #8c8fa1;
@define-color overlay2 #7c7f93;
@define-color blue #1e66f5;
@define-color lavender #7287fd;
@define-color sapphire #209fb5;
@define-color sky #04a5e5;
@define-color teal #179299;
@define-color green #40a02b;
@define-color yellow #df8e1d;
@define-color peach #fe640b;
@define-color maroon #e64553;
@define-color red #d20f39;
@define-color mauve #8839ef;
@define-color pink #ea76cb;
@define-color flamingo #dd7878;
@define-color rosewater #dc8a78;

View File

@ -1,14 +0,0 @@
@define-color dark #2A231C;
@define-color light #EBEBE5;
@define-color accent-dark #463A2E;
@define-color accent-light #865E43;
@define-color pastel-a #797D62;
@define-color pastel-b #9B9B7A;
@define-color pastel-c #D9AE94;
@define-color pastel-d #E5C59E;
@define-color pastel-e #F1DCA7;
@define-color pastel-f #F8D488;
@define-color pastel-g #E4B074;
@define-color pastel-h #D08C60;
@define-color pastel-i #997B66;

View File

@ -8,6 +8,7 @@
with lib; with lib;
with mylib.modules; let with mylib.modules; let
cfg = config.modules.waybar; cfg = config.modules.waybar;
color = config.modules.color;
hyprcfg = config.modules.hyprland; hyprcfg = config.modules.hyprland;
in { in {
options.modules.waybar = import ./options.nix {inherit lib mylib;}; options.modules.waybar = import ./options.nix {inherit lib mylib;};
@ -32,7 +33,8 @@ in {
"custom/launcher" = { "custom/launcher" = {
format = "<span font='FontAwesome'></span> "; format = "<span font='FontAwesome'></span> ";
interval = "once"; interval = "once";
tooltip = false; on-click = "rofi -drun-show-actions -show drun";
tooltip-format = "<tt>Tux Alhamdulillah<tt>";
}; };
"hyprland/workspaces" = { "hyprland/workspaces" = {
@ -84,86 +86,86 @@ in {
}; };
}; };
style = style = ''
(builtins.readFile ./colors/${hyprcfg.theme}.css) /*Order is Top-Right-Bottom-Left for combined properties*/
+ '' window#waybar {
/*Order is Top-Right-Bottom-Left for combined properties*/ font-family: ${color.font};
window#waybar { font-weight: bold;
font-family: JetBrainsMono Nerd Font Mono; color: #${color.light.base};
font-weight: bold;
color: @base;
background-color: rgba(239, 241, 245, 0.6);
}
/*Square Widgets*/ /*Can't use color.light.base here because waybar doesn't support rrggbbaa*/
#custom-launcher, background-color: rgba(239, 241, 245, 0.5);
#workspaces button, }
#tray {
padding: 0px 10px 0px 10px;
margin: 5px 5px 5px 5px;
border-radius: 6px;
color: @base;
}
#workspaces button:hover { /*Square Widgets*/
color: @pink; #custom-launcher,
} #workspaces button,
#tray {
padding: 0px 10px 0px 10px;
margin: 5px 5px 5px 5px;
border-radius: 6px;
color: #${color.light.base};
}
/*Tux Icon*/ #workspaces button:hover {
#custom-launcher { color: #${color.light.pink};
font-size: 18px; }
padding-right: 0px;
}
/*Rectangle Widgets*/ /*Tux Icon*/
#user, #custom-launcher {
#window, font-size: 18px;
#pulseaudio, padding-right: 0px;
#network, }
#cpu,
#memory,
#temperature,
#clock {
padding: 0px 10px 0px 10px;
margin: 8px 5px 8px 5px;
border-radius: 6px;
}
/*Colors*/ /*Rectangle Widgets*/
#custom-launcher { #user,
background-color: @flamingo; #window,
} #pulseaudio,
#user { #network,
background-color: @pink; #cpu,
} #memory,
#window { #temperature,
background-color: @mauve; #clock {
} padding: 0px 10px 0px 10px;
#workspaces button { margin: 8px 5px 8px 5px;
background-color: @red; border-radius: 6px;
} }
#pulseaudio {
background-color: @maroon; /*Colors*/
} #custom-launcher {
#network { background-color: #${color.light.flamingo};
background-color: @peach; }
} #user {
#cpu { background-color: #${color.light.pink};
background-color: @yellow; }
} #window {
#memory { background-color: #${color.light.mauve};
background-color: @green; }
} #workspaces button {
#temperature { background-color: #${color.light.red};
background-color: @teal; }
} #pulseaudio {
#clock { background-color: #${color.light.maroon};
background-color: @sky; }
} #network {
#tray { background-color: #${color.light.peach};
background-color: @sapphire; }
} #cpu {
''; background-color: #${color.light.yellow};
}
#memory {
background-color: #${color.light.green};
}
#temperature {
background-color: #${color.light.teal};
}
#clock {
background-color: #${color.light.sky};
}
#tray {
background-color: #${color.light.sapphire};
}
'';
}; };
}; };
} }