From cb05f66c6a3334d450ae3e38952553dd0b8dc819 Mon Sep 17 00:00:00 2001 From: sefidel Date: Thu, 16 Nov 2023 12:38:27 +0900 Subject: feat(home/gui): use gtk theme from neotheme --- home/profiles/gui/default.nix | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/home/profiles/gui/default.nix b/home/profiles/gui/default.nix index 7fd3d19..2df34ef 100644 --- a/home/profiles/gui/default.nix +++ b/home/profiles/gui/default.nix @@ -38,15 +38,6 @@ in }; config = lib.mkIf cfg.enable { - gtk.enable = true; - gtk.iconTheme.package = pkgs.papirus-icon-theme; - gtk.iconTheme.name = "Papirus-Dark"; - gtk.theme.package = (pkgs.orchis-theme.override { tweaks = [ "primary" "compact" ]; }); - gtk.theme.name = "Orchis-dark-compact"; - gtk.font.name = "${cfg.font.name} ${toString cfg.font.size}"; - - home.file.".icons/default".source = "${pkgs.vanilla-dmz}/share/icons/Vanilla-DMZ-AA"; - neotheme = { name = "Softjelly"; identifier = "softjelly"; @@ -73,8 +64,24 @@ in bright6 = "a5cce3"; bright7 = "d5cdbc"; }; + + gtk = { + theme.dark = "Orchis-Dark-Compact"; + theme.light = "Orchis-Light-Compact"; + iconTheme.dark = "Papirus-Dark"; + iconTheme.light = "Papirus-Light"; + }; }; + gtk.enable = true; + gtk.iconTheme.package = pkgs.papirus-icon-theme; + gtk.iconTheme.name = neotheme.gtk.iconTheme.dark; + gtk.theme.package = (pkgs.orchis-theme.override { tweaks = [ "primary" "compact" ]; }); + gtk.theme.name = neotheme.gtk.theme.dark; + gtk.font.name = "${cfg.font.name} ${toString cfg.font.size}"; + + home.file.".icons/default".source = "${pkgs.vanilla-dmz}/share/icons/Vanilla-DMZ-AA"; + home.packages = [ # Sway pkgs.autotiling -- cgit 1.4.1