From 65a77c9149e612590276af4ca6052f6453ada84a Mon Sep 17 00:00:00 2001 From: Minijackson Date: Sun, 4 Dec 2022 15:07:44 +0100 Subject: graphical: workaround libadwaita, pull theme from master --- usecases/desktop/graphical.nix | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) (limited to 'usecases') diff --git a/usecases/desktop/graphical.nix b/usecases/desktop/graphical.nix index 2d1c3ae..e82b953 100644 --- a/usecases/desktop/graphical.nix +++ b/usecases/desktop/graphical.nix @@ -105,7 +105,12 @@ inputs: { } ]; - home-manager.users.minijackson = { + home-manager.users.minijackson = let + color = + if config.theme.colors.dominantName == "cyan" + then "teal" + else config.theme.colors.dominantName; + in { gtk = { enable = true; iconTheme = { @@ -115,17 +120,21 @@ inputs: { }; name = "Tela-circle-brown-dark"; }; - theme = let - color = - if config.theme.colors.dominantName == "cyan" - then "teal" - else config.theme.colors.dominantName; - in { - package = pkgs.unstable.graphite-gtk-theme.override { - themeVariants = [color]; - sizeVariants = ["compact"]; - tweaks = ["normal" "rimless"]; - }; + theme = { + package = + (pkgs.unstable.graphite-gtk-theme.overrideAttrs (_old: { + src = pkgs.fetchFromGitHub { + owner = "vinceliuice"; + repo = "graphite-gtk-theme"; + rev = "a65fbec34f1ba1e9c7f7a86afc7c02d2210a11a4"; + hash = "sha256-aJMSLWVDqsAx+3QYAAhGKddEaformlK28M7YSJ/v7sU="; + }; + })) + .override { + themeVariants = [color]; + sizeVariants = ["compact"]; + tweaks = ["normal" "rimless"]; + }; name = "Graphite-${color}-Dark-compact"; }; @@ -134,6 +143,8 @@ inputs: { }; }; + home.sessionVariables.GTK_THEME = "Graphite-${color}-Dark-compact"; + services.kdeconnect = { enable = true; indicator = true; -- cgit v1.2.3