Rename colors to theme, clean up color usage

This commit is contained in:
Elnu 2023-01-25 19:05:59 -08:00
parent 5d9fc8f4f3
commit a548fbba06
12 changed files with 60 additions and 60 deletions

View file

@ -1,8 +1,8 @@
{ pkgs, lib, ... }:
let
colors = import ../colors;
in
theme = import ../theme;
in with theme.colors;
{
# Dependencies
home.packages = with pkgs; [
@ -21,15 +21,15 @@ in
tray-position = "right";
font-0 = "Noto Sans Mono;2";
font-1 = "M+ 2p;2";
background = "${colors.bg0}";
foreground = "${colors.fg0}";
background = "${bg0}";
foreground = "${fg0}";
width = "100%";
height = "24pt";
line-size = "3pt";
padding-right = 1;
module-margin = 1;
separator = "|";
separator-foreground = "${colors.disabled}";
separator-foreground = "${disabled}";
cursor-click = "pointer";
cursor-scroll = "ns-resize";
modules-left = [
@ -51,16 +51,16 @@ in
"module/xworkspaces" = {
type = "internal/xworkspaces";
label-active-background = "${colors.bg1}";
label-active-underline = "${colors.primary}";
label-active-background = "${bg1}";
label-active-underline = "${primary}";
label-active-padding-right = 1;
label-occupied-padding-right = 1;
label-urgent-background = "${colors.alert}";
label-urgent-background = "${alert}";
label-urgent-padding-right = 1;
label-empty-foreground = "${colors.disabled}";
label-empty-foreground = "${disabled}";
label-empty-padding-right = 1;
};
"module/xwindow" = {
@ -88,18 +88,18 @@ in
interval = 25;
mount-0 = "/";
label-mounted = "%{F${colors.primary}}%mountpoint%%{F-} %percentage_used%%";
label-mounted = "%{F${primary}}%mountpoint%%{F-} %percentage_used%%";
label-unmounted = "%mountpoint% not mounted";
label-unmounted-foreground = "${colors.disabled}";
label-unmounted-foreground = "${disabled}";
};
"module/pulseaudio" = {
type = "internal/pulseaudio";
format-volume-prefix = "VOL ";
format-volume-prefix-foreground = "${colors.primary}";
format-volume-prefix-foreground = "${primary}";
label-muted = "muted";
label-muted-foreground = "${colors.disabled}";
label-muted-foreground = "${disabled}";
};
"module/memory" = {
type = "internal/memory";
@ -107,7 +107,7 @@ in
interval = 2;
format-prefix = "RAM ";
format-prefix-foreground = "${colors.primary}";
format-prefix-foreground = "${primary}";
};
"module/cpu" = {
type = "internal/cpu";
@ -115,7 +115,7 @@ in
interval = 2;
format-prefix = "CPU ";
format-prefix-foreground = "${colors.primary}";
format-prefix-foreground = "${primary}";
};
"module/date" = {
type = "internal/date";
@ -125,7 +125,7 @@ in
date = "%H:%M";
date-alt = "%Y-%m-%d %H:%M:%S";
label-foreground = "${colors.primary}";
label-foreground = "${primary}";
};
};
};