From 7a4216ae431cb05e2572d83836f9276db0dc57c7 Mon Sep 17 00:00:00 2001 From: ooks-io Date: Tue, 19 Nov 2024 17:13:59 +1100 Subject: [PATCH] nixos: use hozen colors for generated wallpaper --- .../themes/generated-wallpaper.nix | 19 ++++++++----------- modules/nixos/workstation/themes/minimal.nix | 8 ++------ 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/modules/nixos/workstation/themes/generated-wallpaper.nix b/modules/nixos/workstation/themes/generated-wallpaper.nix index 7009f07..f1c920c 100644 --- a/modules/nixos/workstation/themes/generated-wallpaper.nix +++ b/modules/nixos/workstation/themes/generated-wallpaper.nix @@ -2,9 +2,10 @@ { pkgs, config, + hozen, }: let inherit (config.ooknet.hardware) monitors; - inherit (config.ooknet.appearance) colorscheme; + inherit (hozen) color; largest = f: xs: builtins.head (builtins.sort (a: b: a > b) (map f xs)); largestWidth = largest (x: x.width) monitors; largestHeight = largest (x: x.height) monitors; @@ -13,21 +14,17 @@ in width ? largestWidth, height ? largestHeight, logoScale ? 4, - backgroundColor ? colorscheme.palette.mantle, - logoColor1 ? colorscheme.palette.yellow, - logoColor2 ? colorscheme.palette.green, + backgroundColor ? color.layout.body, + logoColor1 ? color.green.base, + logoColor2 ? color.yellow.base, }: pkgs.stdenv.mkDerivation { - name = "generated-nix-wallpaper-${colorscheme.slug}.png"; + name = "generated-nix-wallpaper-${color.slug}.png"; src = pkgs.writeTextFile { name = "template.svg"; text = '' - - + + diff --git a/modules/nixos/workstation/themes/minimal.nix b/modules/nixos/workstation/themes/minimal.nix index 9ca1680..1050dce 100644 --- a/modules/nixos/workstation/themes/minimal.nix +++ b/modules/nixos/workstation/themes/minimal.nix @@ -2,11 +2,12 @@ config, lib, pkgs, + hozen, ... }: let inherit (lib) mkIf; inherit (config.ooknet.workstation) theme; - generatedWallpaper = import ./generated-wallpaper.nix {inherit config pkgs;} {}; + generatedWallpaper = import ./generated-wallpaper.nix {inherit hozen config pkgs;} {}; in { config = mkIf (theme == "minimal") { ooknet.appearance = { @@ -30,11 +31,6 @@ in { wallpaper = { path = "${generatedWallpaper}"; }; - - colorscheme = { - name = "gruvbox-material"; - variant = "dark"; - }; }; }; }