From f9af88d745e482d4a19314c3c6d96cdbabb39177 Mon Sep 17 00:00:00 2001 From: notgne2 Date: Sat, 10 Jul 2021 14:27:00 -0700 Subject: [PATCH] use rycee's gtk theme generation --- flake.nix | 4 ++++ home-manager/modules/colors.nix | 42 +++++---------------------------- 2 files changed, 10 insertions(+), 36 deletions(-) diff --git a/flake.nix b/flake.nix index 5e4cd4d..06b58ca 100644 --- a/flake.nix +++ b/flake.nix @@ -8,6 +8,10 @@ url = "github:kdrag0n/base16-kitty"; flake = false; }; + rycee = { + url = "gitlab:rycee/nur-expressions"; + flake = false; + }; }; outputs = { self, nixpkgs, ... }@inputs: { diff --git a/home-manager/modules/colors.nix b/home-manager/modules/colors.nix index d67b5ac..d6542ca 100644 --- a/home-manager/modules/colors.nix +++ b/home-manager/modules/colors.nix @@ -306,42 +306,12 @@ in enable = true; theme = let - materia_colors = pkgs.writeText "gtk-generated-colors" '' - BG=${cfg.favColors.base16.base00} - FG=${cfg.favColors.base16.base07} - BTN_BG=${cfg.favColors.base16.base00} - BTN_FG=${cfg.favColors.base16.base07} - MENU_BG=${cfg.favColors.base16.base00} - MENU_FG=${cfg.favColors.base16.base07} - ACCENT_BG=${cfg.favColors.base16.base02} - SEL_BG=${cfg.favColors.base16.base0D} - SEL_FG=${cfg.favColors.base16.base00} - TXT_BG=${cfg.favColors.base16.base00} - TXT_FG=${cfg.favColors.base16.base07} - HDR_BTN_BG=${cfg.favColors.base16.base00} - HDR_BTN_FG=${cfg.favColors.base16.base07} - WM_BORDER_FOCUS=${cfg.favColors.base16.base02} - WM_BORDER_UNFOCUS=${cfg.favColors.base16.base01} - MATERIA_STYLE_COMPACT=True - MATERIA_COLOR_VARIANT=dark - UNITY_DEFAULT_LAUNCHER_STYLE=False - NAME=generated - ''; - - generated-gtk-theme = pkgs.stdenv.mkDerivation { - name = "generated-gtk-theme"; - src = pkgs.materia-theme.src; - buildInputs = with pkgs; [ sassc bc which inkscape optipng ]; - installPhase = '' - HOME=/build - chmod 777 -R . - patchShebangs . - mkdir -p $out/share/themes - substituteInPlace change_color.sh --replace "\$HOME/.themes" "$out/share/themes" - echo "Changing colours:" - ./change_color.sh -o Generated ${materia_colors} - chmod 555 -R . - ''; + generated-gtk-theme = pkgs.callPackage "${inputs.rycee}/pkgs/materia-theme" { + configBase16 = { + name = "Generated"; + kind = "dark"; + colors = builtins.mapAttrs (k: v: { hex.rgb = v; }) cfg.favColors.base16; + }; }; in {