color rework, flake bump
This commit is contained in:
@@ -1,12 +1,10 @@
|
||||
{ config, lib, pkgs, user, rice, ... }:
|
||||
{ config, lib, pkgs, pkgs-unstable, user, rice, ... }:
|
||||
let
|
||||
sep = " ";
|
||||
in
|
||||
lib.mkIf (user != "tv")
|
||||
{
|
||||
home.packages = with pkgs; [
|
||||
waybar
|
||||
|
||||
(pkgs.writeShellScriptBin "waybar_mode" ''
|
||||
#!/usr/bin/env bash
|
||||
print_help() {
|
||||
@@ -50,10 +48,11 @@ lib.mkIf (user != "tv")
|
||||
fi
|
||||
'')
|
||||
|
||||
];
|
||||
] ++ [ pkgs-unstable.waybar ];
|
||||
|
||||
programs.waybar = {
|
||||
enable = true;
|
||||
package = pkgs-unstable.waybar;
|
||||
settings = {
|
||||
bar = {
|
||||
height = 20;
|
||||
@@ -176,7 +175,7 @@ lib.mkIf (user != "tv")
|
||||
transition-duration: 2s;
|
||||
padding: 7px 10px;
|
||||
padding-top: 0.1em;
|
||||
/* border: ${builtins.toString rice.border-width}px solid rgb(${rice.lib.hex-to-rgb-comma-string rice.color.blue}); */
|
||||
/* border: ${builtins.toString rice.border-width}px solid rgb(${rice.lib.hex-to-rgb-comma-string rice.color.blue.base}); */
|
||||
/* margin: ${builtins.toString rice.gap-size}px; */
|
||||
border-radius: ${builtins.toString rice.rounding}px;
|
||||
|
||||
@@ -199,51 +198,51 @@ lib.mkIf (user != "tv")
|
||||
padding: 0px 3px;
|
||||
margin-top: 0.3em;
|
||||
border-radius: ${builtins.toString rice.rounding}px;
|
||||
color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.bright-cyan});
|
||||
color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.cyan.bright});
|
||||
}
|
||||
|
||||
#workspaces button {
|
||||
color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.bright-black});
|
||||
color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.grey.base});
|
||||
margin-left: 10px;
|
||||
margin-right: 10px;
|
||||
border-radius: ${builtins.toString rice.rounding}px;
|
||||
}
|
||||
|
||||
#workspaces button.active {
|
||||
color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.bright-cyan});
|
||||
color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.cyan.bright});
|
||||
}
|
||||
|
||||
#workspaces button:hover {
|
||||
color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.background});
|
||||
background-color: rgba(${rice.lib.hex-to-rgb-comma-string rice.color.bright-cyan},${builtins.toString rice.transparency});
|
||||
background-color: rgba(${rice.lib.hex-to-rgb-comma-string rice.color.cyan.bright},${builtins.toString rice.transparency});
|
||||
}
|
||||
|
||||
#workspaces button.urgent {
|
||||
background-color: rgba(${rice.lib.hex-to-rgb-comma-string rice.color.magenta},${builtins.toString rice.transparency});
|
||||
background-color: rgba(${rice.lib.hex-to-rgb-comma-string rice.color.magenta.base},${builtins.toString rice.transparency});
|
||||
}
|
||||
|
||||
#custom-mode {
|
||||
color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.red});
|
||||
color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.red.base});
|
||||
}
|
||||
|
||||
#window, #custom-ctimeremaining {
|
||||
font-family: ${rice.font.base.name}, ${rice.font.code.name2};
|
||||
color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.blue});
|
||||
color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.blue.base});
|
||||
}
|
||||
|
||||
#wireplumber.muted {
|
||||
color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.blue});
|
||||
color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.blue.base});
|
||||
}
|
||||
|
||||
#battery.warning:not(.charging) {
|
||||
color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.green});;
|
||||
color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.green.base});;
|
||||
}
|
||||
|
||||
#battery.critical {
|
||||
color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.red});;
|
||||
background: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.bright-red});
|
||||
color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.red.dark});;
|
||||
background: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.red.bright});
|
||||
}
|
||||
#battery.charging { color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.green}); }
|
||||
#battery.charging { color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.green.base}); }
|
||||
'';
|
||||
|
||||
#battery.critical:not(.charging) {
|
||||
|
||||
Reference in New Issue
Block a user