diff --git a/hosts/thinkpad/modules/graphics/default.nix b/hosts/thinkpad/modules/graphics/default.nix index 5fc328d..96944ca 100644 --- a/hosts/thinkpad/modules/graphics/default.nix +++ b/hosts/thinkpad/modules/graphics/default.nix @@ -16,7 +16,7 @@ ]; }; console = { - colors = let colors = config.home-manager.users.rouven.colorScheme.colors; in + colors = let colors = config.home-manager.users.rouven.colorScheme.palette; in [ colors.base00 colors.base08 diff --git a/users/rouven/modules/foot/default.nix b/users/rouven/modules/foot/default.nix index 0dbd7a5..899c959 100644 --- a/users/rouven/modules/foot/default.nix +++ b/users/rouven/modules/foot/default.nix @@ -53,7 +53,7 @@ }; colors = let - colors = config.colorScheme.colors; + colors = config.colorScheme.palette; in { # alpha = if (config.colorScheme.kind == "dark") then 0.0 else 1.0; diff --git a/users/rouven/modules/wayland/default.nix b/users/rouven/modules/wayland/default.nix index 3603f27..16f0b52 100644 --- a/users/rouven/modules/wayland/default.nix +++ b/users/rouven/modules/wayland/default.nix @@ -79,12 +79,12 @@ terminal=${pkgs.foot}/bin/foot [colors] - background=${config.colorScheme.colors.base00}ff - text=${config.colorScheme.colors.base05}ff - match=${config.colorScheme.colors.base08}ff - selection=${config.colorScheme.colors.base02}ff - selection-text=${config.colorScheme.colors.base04}ff - border=${config.colorScheme.colors.base01}ff + background=${config.colorScheme.palette.base00}ff + text=${config.colorScheme.palette.base05}ff + match=${config.colorScheme.palette.base08}ff + selection=${config.colorScheme.palette.base02}ff + selection-text=${config.colorScheme.palette.base04}ff + border=${config.colorScheme.palette.base01}ff ''; "swappy/config".text = '' [Default] @@ -95,10 +95,10 @@ indicator-radius=200 indicator-thickness=3 inside-color=00000000 - inside-ver-color=${config.colorScheme.colors.base0D} - inside-clear-color=${config.colorScheme.colors.base0B} - ring-color=${config.colorScheme.colors.base03} - ring-wrong-color=${config.colorScheme.colors.base08} + inside-ver-color=${config.colorScheme.palette.base0D} + inside-clear-color=${config.colorScheme.palette.base0B} + ring-color=${config.colorScheme.palette.base03} + ring-wrong-color=${config.colorScheme.palette.base08} screenshot effect-blur=7x5 ''; @@ -110,8 +110,8 @@ background-color: rgba(12, 12, 12, 0); } button { - color: #${config.colorScheme.colors.base05}; - background-color: #${config.colorScheme.colors.base00}; + color: #${config.colorScheme.palette.base05}; + background-color: #${config.colorScheme.palette.base00}; border-style: solid; border-width: 2px; border-radius: 30px; @@ -122,7 +122,7 @@ } button:active, button:hover { - background-color: #${config.colorScheme.colors.base03}; + background-color: #${config.colorScheme.palette.base03}; outline-style: none; } diff --git a/users/rouven/modules/wayland/waybar.nix b/users/rouven/modules/wayland/waybar.nix index 2c90c75..7220107 100644 --- a/users/rouven/modules/wayland/waybar.nix +++ b/users/rouven/modules/wayland/waybar.nix @@ -107,7 +107,7 @@ window#waybar { background-color: transparent; - color: #${config.colorScheme.colors.base05}; + color: #${config.colorScheme.palette.base05}; transition-property: background-color; transition-duration: .5s; } @@ -120,17 +120,17 @@ #tags button { padding: 0 5px; background-color: transparent; - color: #${config.colorScheme.colors.base05}; + color: #${config.colorScheme.palette.base05}; } #workspaces button.focused, #tags button.focused { - background-color: #${config.colorScheme.colors.base04}; - box-shadow: inset 0 -3px #${config.colorScheme.colors.base05}; + background-color: #${config.colorScheme.palette.base04}; + box-shadow: inset 0 -3px #${config.colorScheme.palette.base05}; } #tags button.occupied { - box-shadow: inset 0 -3px #${config.colorScheme.colors.base05}; + box-shadow: inset 0 -3px #${config.colorScheme.palette.base05}; } #workspaces button.urgent, @@ -151,7 +151,7 @@ #tray{ border-radius: 30px; padding: 0 10px; - color: #${config.colorScheme.colors.base05}; + color: #${config.colorScheme.palette.base05}; } #window, @@ -160,12 +160,12 @@ } #window { - background-color: #${config.colorScheme.colors.base00}; + background-color: #${config.colorScheme.palette.base00}; } #clock { - background-color: #${config.colorScheme.colors.base00}; + background-color: #${config.colorScheme.palette.base00}; } #custom-spotifytitle { @@ -182,53 +182,53 @@ } #battery { - background-color: #${config.colorScheme.colors.base02}; - color: #${config.colorScheme.colors.base05}; + background-color: #${config.colorScheme.palette.base02}; + color: #${config.colorScheme.palette.base05}; } #battery.charging, #battery.plugged { - color: #${config.colorScheme.colors.base05}; - background-color: #${config.colorScheme.colors.base02}; + color: #${config.colorScheme.palette.base05}; + background-color: #${config.colorScheme.palette.base02}; } #battery.critical:not(.charging) { - background-color: #${config.colorScheme.colors.base08}; - color: #${config.colorScheme.colors.base01}; + background-color: #${config.colorScheme.palette.base08}; + color: #${config.colorScheme.palette.base01}; } #cpu { - background-color: #${config.colorScheme.colors.base05}; - color: #${config.colorScheme.colors.base01}; + background-color: #${config.colorScheme.palette.base05}; + color: #${config.colorScheme.palette.base01}; } #network { - background-color: #${config.colorScheme.colors.base06}; - color: #${config.colorScheme.colors.base01}; + background-color: #${config.colorScheme.palette.base06}; + color: #${config.colorScheme.palette.base01}; } #network.disconnected { - background-color: #${config.colorScheme.colors.base08}; + background-color: #${config.colorScheme.palette.base08}; } #pulseaudio { - background-color: #${config.colorScheme.colors.base03}; - color: #${config.colorScheme.colors.base05}; + background-color: #${config.colorScheme.palette.base03}; + color: #${config.colorScheme.palette.base05}; } #temperature { - background-color: #${config.colorScheme.colors.base05}; - color: #${config.colorScheme.colors.base01}; + background-color: #${config.colorScheme.palette.base05}; + color: #${config.colorScheme.palette.base01}; } #temperature.critical { - background-color: #${config.colorScheme.colors.base08}; - color: #${config.colorScheme.colors.base01}; + background-color: #${config.colorScheme.palette.base08}; + color: #${config.colorScheme.palette.base01}; } #custom-notification, #tray { - background-color: #${config.colorScheme.colors.base01}; - color: #${config.colorScheme.colors.base05}; + background-color: #${config.colorScheme.palette.base01}; + color: #${config.colorScheme.palette.base05}; } '';