From 6dc91747313171c49397117d897f257dcc543195 Mon Sep 17 00:00:00 2001 From: Danilo Reyes Date: Fri, 25 Jul 2025 01:19:36 -0600 Subject: [PATCH] stylix properly handles being disabled --- config/stylix.nix | 12 ++++++++++-- hosts/workstation/toggles.nix | 2 +- modules/dev/emacs.nix | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/config/stylix.nix b/config/stylix.nix index 18920b0..1850aed 100644 --- a/config/stylix.nix +++ b/config/stylix.nix @@ -14,15 +14,23 @@ in config = { stylix = { inherit (scheme) image polarity; - enable = cfg.enable; + enable = true; + autoEnable = cfg.enable; targets.qt.platform = lib.mkForce "qtct"; } // lib.optionalAttrs (scheme ? base16Scheme) { inherit (scheme) base16Scheme; }; home-manager.users.jawz = { gtk = lib.mkIf (!cfg.enable) { - iconTheme = scheme.iconPackage; + enable = true; + iconTheme = { + name = "Papirus-Light"; + package = pkgs.papirus-icon-theme.override { + color = "yellow"; + }; + }; }; stylix = { enable = cfg.enable; + autoEnable = cfg.enable; iconTheme = { enable = cfg.enable; package = scheme.iconPackage; diff --git a/hosts/workstation/toggles.nix b/hosts/workstation/toggles.nix index 48d74ae..4eb7f8f 100644 --- a/hosts/workstation/toggles.nix +++ b/hosts/workstation/toggles.nix @@ -6,7 +6,7 @@ let enableList = func: list: list |> map func |> builtins.listToAttrs; in { - stylix.enable = true; + stylix.enable = false; emacs.enable = true; enableContainers = true; servers.drpp.enable = true; diff --git a/modules/dev/emacs.nix b/modules/dev/emacs.nix index 709f9a0..afa01b6 100644 --- a/modules/dev/emacs.nix +++ b/modules/dev/emacs.nix @@ -59,7 +59,7 @@ extraConfig ; extra = extraPackages epkgs; - themes = lib.optional config.stylix.enable [ + themes = lib.optional config.my.stylix.enable [ (epkgs.trivialBuild { pname = "stylix-theme"; src = pkgs.writeText "stylix-theme.el" extraConfig;