From 43d2a4845da377dd9f6c46c27f55f39feabaf4bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Mon, 15 Jan 2024 23:22:02 +0100 Subject: [PATCH] fix(stylix): Always set options Stylix cannot be disabled: https://github.com/danth/stylix/issues/216 --- nixos/default.nix | 3 ++- nixos/options.nix | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/default.nix b/nixos/default.nix index 84408a6..ae1ee09 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -7,11 +7,12 @@ in ./options.nix ./gui stylix.nixosModules.stylix + # FIXME(https://github.com/danth/stylix/issues/216): Must configure stylix + { stylix = import ./stylix-config.nix { inherit config pkgs; }; } ]; config = lib.mkIf cfg.enable { boot.plymouth.enable = cfg.styling.enable; - stylix = lib.mkIf cfg.styling.enable (import ./stylix-config.nix { inherit config pkgs; }); # Enable unlocking the gpg-agent at boot (configured through home.nix) security.pam.services.login.gnupg.enable = true; diff --git a/nixos/options.nix b/nixos/options.nix index 4cf5b8d..89abd11 100644 --- a/nixos/options.nix +++ b/nixos/options.nix @@ -27,7 +27,7 @@ let }; styling.options = { - enable = mkDisableOption "jalil's default styling"; + enable = mkDisableOption "jalil's default styling (cannot be disabled currently)"; wallpaper = lib.mkOption { description = "The wallpaper to use."; type = types.str;