ditch nix-colors

This commit is contained in:
Noa Aarts 2025-05-04 15:25:41 +02:00
parent 45766f2057
commit 2e58acb9e7
Signed by: noa
GPG key ID: 1850932741EFF672
22 changed files with 57 additions and 162 deletions

View file

@ -15,12 +15,6 @@
remotePlay.openFirewall = true;
gamescopeSession.enable = true;
dedicatedServer.openFirewall = true;
extraPkgs =
pkgs: with pkgs; [
pango
libthai
harfbuzz
];
};
alvr = {

View file

@ -37,20 +37,20 @@ in
};
style = ''
#battery {
color: #${config.colorScheme.palette.taskbarText};
color: #${config.lib.stylix.colors.base04};
margin: 5px 2px;
padding: 0 12px;
border-radius: 999px;
min-width: 40px;
transition: all 0.3s;
background-color: #${config.colorScheme.palette.taskbarBackground};
background-color: #${config.lib.stylix.colors.base10};
}
#battery.charging,
#battery.plugged,
#battery.full {
color: #${config.colorScheme.palette.taskbarText};
background-color: #${config.colorScheme.palette.taskbarBackground};
color: #${config.lib.stylix.colors.base04};
background-color: #${config.lib.stylix.colors.base10};
box-shadow: none;
}
@ -61,16 +61,16 @@ in
@keyframes batteryCritical {
0% {
background-color: #${config.colorScheme.palette.base08};
color: #${config.colorScheme.palette.base06};
background-color: #${config.lib.stylix.colors.base08};
color: #${config.lib.stylix.colors.base06};
}
50% {
background-color: #${config.colorScheme.palette.base02};
color: #${config.colorScheme.palette.base08};
background-color: #${config.lib.stylix.colors.base02};
color: #${config.lib.stylix.colors.base08};
}
100% {
background-color: #${config.colorScheme.palette.base08};
color: #${config.colorScheme.palette.base06};
background-color: #${config.lib.stylix.colors.base08};
color: #${config.lib.stylix.colors.base06};
}
}
'';

View file

@ -22,10 +22,10 @@ in
};
style = ''
#custom-bluetooth {
color: #${config.colorScheme.palette.taskbarText};
color: #${config.lib.stylix.colors.base04};
margin: 5px 0px;
padding: 0 8px;
background-color: #${config.colorScheme.palette.taskbarBackground};
background-color: #${config.lib.stylix.colors.base10};
border-radius: 999px 0 0 999px;
}
'';

View file

@ -23,15 +23,15 @@ in
calendar = {
weeks-pos = "left";
format = {
today = "<span color='#${config.colorScheme.palette.base17}'><u>{}</u></span>"; # TODO: use nix-colors
weeks = "<span color='#${config.colorScheme.palette.base17}'>{}</span>"; # TODO: use nix-colors
today = "<span color='#${config.lib.stylix.colors.base17}'><u>{}</u></span>";
weeks = "<span color='#${config.lib.stylix.colors.base17}'>{}</span>";
};
};
};
style = ''
#clock {
color: #${config.colorScheme.palette.taskbarText};
background-color: #${config.colorScheme.palette.taskbarBackground};
color: #${config.lib.stylix.colors.base04};
background-color: #${config.lib.stylix.colors.base10};
margin: 5px 0px;
padding: 0 12px;
border-radius: 999px 0 0 999px;

View file

@ -17,10 +17,10 @@ in
};
style = ''
#cpu {
color: #${config.colorScheme.palette.taskbarText};
color: #${config.lib.stylix.colors.base04};
margin: 5px 0px;
padding: 0 8px;
background-color: #${config.colorScheme.palette.taskbarBackground};
background-color: #${config.lib.stylix.colors.base10};
}
'';
};

View file

@ -50,7 +50,6 @@ in
./spotify.nix
./battery.nix
./bluetooth.nix
../../common/colors.nix
];
config = lib.mkIf cfg.enable {
@ -101,7 +100,7 @@ in
window#waybar {
background-color: transparent;
color: #${config.colorScheme.palette.taskbarText};
color: #${config.lib.stylix.colors.base04};
transition-property: background-color;
transition-duration: 0.5s;
}
@ -131,11 +130,11 @@ in
}
tooltip {
background-color: #${config.colorScheme.palette.base00};
background-color: #${config.lib.stylix.colors.base00};
border: 1px solid;
border-color: #${config.colorScheme.palette.taskbarText};
border-color: #${config.lib.stylix.colors.base04};
border-radius: 10px;
color: #${config.colorScheme.palette.base05};
color: #${config.lib.stylix.colors.base05};
}
tooltip label {
padding: 5px;

View file

@ -17,10 +17,10 @@ in
};
style = ''
#memory {
color: #${config.colorScheme.palette.taskbarText};
color: #${config.lib.stylix.colors.base04};
margin: 5px 0px;
padding: 0 8px;
background-color: #${config.colorScheme.palette.taskbarBackground};
background-color: #${config.lib.stylix.colors.base10};
}
'';
};

View file

@ -21,15 +21,15 @@ in
};
style = ''
#network {
color: #${config.colorScheme.palette.taskbarText};
color: #${config.lib.stylix.colors.base04};
margin: 5px 0px;
padding: 0 8px;
background-color: #${config.colorScheme.palette.taskbarBackground};
background-color: #${config.lib.stylix.colors.base10};
}
#network.disconnected {
transition: all 0.2s;
color: #${config.colorScheme.palette.base02};
color: #${config.lib.stylix.colors.base02};
}
'';
};

View file

@ -24,11 +24,11 @@ in
};
style = ''
#custom-poweroff {
color: #${config.colorScheme.palette.taskbarText};
color: #${config.lib.stylix.colors.base04};
margin: 0px 2px;
padding: 0 15px;
border-radius: 999px;
box-shadow: inset 0 0 0 1px #${config.colorScheme.palette.base01};
box-shadow: inset 0 0 0 1px #${config.lib.stylix.colors.base01};
}
'';
};

View file

@ -26,10 +26,10 @@ in
};
style = ''
#custom-spotify {
color: #${config.colorScheme.palette.base14};
color: #${config.lib.stylix.colors.base14};
margin: 5px 0px;
padding: 0 8px;
background-color: #${config.colorScheme.palette.taskbarBackground};
background-color: #${config.lib.stylix.colors.base10};
border-radius: 0 999px 999px 0;
}
'';

View file

@ -24,15 +24,15 @@ in
};
style = ''
#temperature {
color: #${config.colorScheme.palette.taskbarText};
color: #${config.lib.stylix.colors.base04};
margin: 5px 0px;
padding: 0 8px;
background-color: #${config.colorScheme.palette.taskbarBackground};
background-color: #${config.lib.stylix.colors.base10};
border-radius: 0 999px 999px 0;
}
#temperature.critcal {
color: #${config.colorScheme.palette.base08};
color: #${config.lib.stylix.colors.base08};
}
'';
};

View file

@ -16,11 +16,11 @@ in
};
style = ''
#tray {
color: #${config.colorScheme.palette.taskbarText};
color: #${config.lib.stylix.colors.base04};
margin: 5px 0px;
padding: 4px 10px;
border-radius: 999px;
background-color: #${config.colorScheme.palette.taskbarBackground};
background-color: #${config.lib.stylix.colors.base10};
}
#tray > * {
@ -32,7 +32,7 @@ in
}
#tray > .needs-attention {
background-color: #${config.colorScheme.palette.base08};
background-color: #${config.lib.stylix.colors.base08};
border-radius: 999px;
}
'';

View file

@ -18,7 +18,7 @@ in
window#waybar {
background-color: transparent;
border-radius: 999px;
color: #${config.colorScheme.palette.base05};
color: #${config.lib.stylix.colors.base05};
transition-property: background-color;
transition-duration: .5s;
}
@ -37,7 +37,7 @@ in
#window {
margin-left: 6px;
color: #${config.colorScheme.palette.taskbarText};
color: #${config.lib.stylix.colors.base04};
}
'';
};

View file

@ -28,10 +28,10 @@ in
};
style = ''
#wireplumber {
color: #${config.colorScheme.palette.taskbarText};
color: #${config.lib.stylix.colors.base04};
margin: 5px 0px;
padding: 0 8px;
background-color: #${config.colorScheme.palette.taskbarBackground};
background-color: #${config.lib.stylix.colors.base10};
}
'';
};

View file

@ -24,21 +24,21 @@ in
min-width: 15px;
min-height: 15px;
background-color: transparent;
color: #${config.colorScheme.palette.taskbarText};
color: #${config.lib.stylix.colors.base04};
border-radius: 999px;
}
#workspaces button:hover {
background-color: #${config.colorScheme.palette.base17};
background-color: #${config.lib.stylix.colors.base17};
}
#workspaces button.active {
font-weight: bold;
background-color: #${config.colorScheme.palette.base0E};
background-color: #${config.lib.stylix.colors.base0E};
}
#workspaces button.urgent {
background-color: #${config.colorScheme.palette.base08};
background-color: #${config.lib.stylix.colors.base08};
}
#workspaces {