From 9bd004c3a8e2e07c5e81144ef57a98a1fb3de474 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Thu, 20 Jun 2024 21:47:41 -0400 Subject: [PATCH] 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 --- assets/selenized-black.yaml | 21 +++++++++++++++++++++ hosts/laptop/configuration.nix | 1 - modules/desktop.nix | 11 +++-------- 3 files changed, 24 insertions(+), 9 deletions(-) create mode 100644 assets/selenized-black.yaml diff --git a/assets/selenized-black.yaml b/assets/selenized-black.yaml new file mode 100644 index 00000000..2d5b12f7 --- /dev/null +++ b/assets/selenized-black.yaml @@ -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" diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix index dd478cf8..b6a461ac 100644 --- a/hosts/laptop/configuration.nix +++ b/hosts/laptop/configuration.nix @@ -24,7 +24,6 @@ in desktop = { bloat = true; - theme = "selenized-black"; }; }; } diff --git a/modules/desktop.nix b/modules/desktop.nix index d3019acf..e341abbf 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -2,9 +2,9 @@ let inherit (lib) mkEnableOption mkIf mkMerge mkOption; - inherit (lib.types) str float int; + inherit (lib.types) float int; 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 (pkgs) phinger-cursors noto-fonts-cjk-sans maple-mono noto-fonts-emoji; inherit (builtins) attrValues; @@ -22,11 +22,6 @@ in }; options.modules.desktop = { - theme = mkOption { - type = str; - default = "monokai"; - }; - opacity = mkOption { type = float; default = 0.95; @@ -203,7 +198,7 @@ in stylix = { image = ../assets/wallpaper.png; polarity = "dark"; - base16Scheme = "${pkgs.base16-schemes}/share/themes/${theme}.yaml"; + base16Scheme = ../assets/selenized-black.yaml; opacity = { terminal = opacity;