nix: Avoid IFD by importing base16 scheme directly

This fixes an issue where previously the derivation had to be evaluated
before importing the base16 scheme, thus causing `nix flake check` to
fail when multi-platform support was added.

See: https://github.com/NixOS/nix/issues/4265
This commit is contained in:
Donovan Glover 2024-06-20 21:47:41 -04:00
parent b80f3f2340
commit 9bd004c3a8
No known key found for this signature in database
GPG Key ID: EA7408A77AE1BE65
3 changed files with 24 additions and 9 deletions

View File

@ -0,0 +1,21 @@
system: "base16"
name: "selenized-black"
author: "Jan Warchol (https://github.com/jan-warchol/selenized) / adapted to base16 by ali"
variant: "dark"
palette:
base00: "181818"
base01: "252525"
base02: "3b3b3b"
base03: "777777"
base04: "777777"
base05: "b9b9b9"
base06: "dedede"
base07: "dedede"
base08: "ed4a46"
base09: "e67f43"
base0A: "dbb32d"
base0B: "70b433"
base0C: "3fc5b7"
base0D: "368aeb"
base0E: "a580e2"
base0F: "eb6eb7"

View File

@ -24,7 +24,6 @@ in
desktop = { desktop = {
bloat = true; bloat = true;
theme = "selenized-black";
}; };
}; };
} }

View File

@ -2,9 +2,9 @@
let let
inherit (lib) mkEnableOption mkIf mkMerge mkOption; inherit (lib) mkEnableOption mkIf mkMerge mkOption;
inherit (lib.types) str float int; inherit (lib.types) float int;
inherit (config.modules.system) username; inherit (config.modules.system) username;
inherit (cfg) bloat gnome plasma container theme opacity fontSize graphical phone phosh; inherit (cfg) bloat gnome plasma container opacity fontSize graphical phone phosh;
inherit (nix-config.packages.${pkgs.system}) aleo-fonts; inherit (nix-config.packages.${pkgs.system}) aleo-fonts;
inherit (pkgs) phinger-cursors noto-fonts-cjk-sans maple-mono noto-fonts-emoji; inherit (pkgs) phinger-cursors noto-fonts-cjk-sans maple-mono noto-fonts-emoji;
inherit (builtins) attrValues; inherit (builtins) attrValues;
@ -22,11 +22,6 @@ in
}; };
options.modules.desktop = { options.modules.desktop = {
theme = mkOption {
type = str;
default = "monokai";
};
opacity = mkOption { opacity = mkOption {
type = float; type = float;
default = 0.95; default = 0.95;
@ -203,7 +198,7 @@ in
stylix = { stylix = {
image = ../assets/wallpaper.png; image = ../assets/wallpaper.png;
polarity = "dark"; polarity = "dark";
base16Scheme = "${pkgs.base16-schemes}/share/themes/${theme}.yaml"; base16Scheme = ../assets/selenized-black.yaml;
opacity = { opacity = {
terminal = opacity; terminal = opacity;