diff --git a/hosts/thinkpad/default.nix b/hosts/thinkpad/default.nix index 60c89b8..77d22a5 100755 --- a/hosts/thinkpad/default.nix +++ b/hosts/thinkpad/default.nix @@ -24,25 +24,29 @@ console = { keyMap = "dvorak"; font = "Lat2-Terminus16"; - colors = [ - # hardcoded dracula since nix-colors only provides a home manager module - "282936" - "3a3c4e" - "4d4f68" - "626483" - "62d6e8" - "e9e9f4" - "f1f2f8" - "f7f7fb" - "ea51b2" - "b45bcf" - "00f769" - "ebff87" - "a1efe4" - "62d6e8" - "b45bcf" - "00f769" - ]; + colors = + let + colors = config.home-manager.users.rouven.colorScheme.colors; + in + [ + colors.base00 + colors.base08 + colors.base0A + colors.base0B + colors.base0D + colors.base0E + colors.base0C + colors.base05 + + colors.base03 + colors.base08 + colors.base0A + colors.base0B + colors.base0D + colors.base0E + colors.base0C + colors.base07 + ]; }; fonts.fonts = with pkgs; [ diff --git a/users/rouven/modules/foot/default.nix b/users/rouven/modules/foot/default.nix index 45a695b..3084d1e 100644 --- a/users/rouven/modules/foot/default.nix +++ b/users/rouven/modules/foot/default.nix @@ -13,27 +13,31 @@ font = "monospace:size=8"; }; cursor.color = "${colors.background} ${colors.foreground}"; - colors = { - alpha = 0.0; - background = config.colorScheme.colors.base00; - foreground = config.colorScheme.colors.base05; - regular0 = config.colorScheme.colors.base00; - regular1 = config.colorScheme.colors.base01; - regular2 = config.colorScheme.colors.base02; - regular3 = config.colorScheme.colors.base03; - regular4 = config.colorScheme.colors.base04; - regular5 = config.colorScheme.colors.base05; - regular6 = config.colorScheme.colors.base06; - regular7 = config.colorScheme.colors.base07; - bright0 = config.colorScheme.colors.base08; - bright1 = config.colorScheme.colors.base09; - bright2 = config.colorScheme.colors.base0A; - bright3 = config.colorScheme.colors.base0B; - bright4 = config.colorScheme.colors.base0C; - bright5 = config.colorScheme.colors.base0D; - bright6 = config.colorScheme.colors.base0E; - bright7 = config.colorScheme.colors.base0F; - }; + colors = + let + colors = config.colorScheme.colors; + in + { + alpha = 0.0; + background = colors.base00; + foreground = colors.base05; + regular0 = colors.base02; + regular1 = colors.base08; + regular2 = colors.base0A; + regular3 = colors.base0B; + regular4 = colors.base0D; + regular5 = colors.base0E; + regular6 = colors.base0C; + regular7 = colors.base05; + bright0 = colors.base03; + bright1 = colors.base08; + bright2 = colors.base0A; + bright3 = colors.base0B; + bright4 = colors.base0D; + bright5 = colors.base0E; + bright6 = colors.base0C; + bright7 = colors.base07; + }; }; }; }