3 files changed, 13 insertions, 4 deletions
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index 6ad371d..d851699 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -4,6 +4,9 @@
   config,
   ...
 }:
+let
+  cfg = config.desktop;
+in
 {
   imports = [
     ./rofi
@@ -19,7 +22,7 @@
     enable = lib.mkEnableOption "Enables graphical interface.";
   };
 
-  config = lib.mkIf config.desktop.enable {
+  config = lib.mkIf cfg.enable {
     xdg.enable = true;
   };
 }
diff --git a/modules/desktop/mako/colors.nix b/modules/desktop/mako/colors.nix
index 0ba4d33..6186dd6 100644
--- a/modules/desktop/mako/colors.nix
+++ b/modules/desktop/mako/colors.nix
@@ -5,8 +5,11 @@
   pkgs,
   ...
 }:
+let
+  cfg = config.desktop.mako;
+in
 {
-  config.services.mako.settings = lib.mkIf config.desktop.mako.enable (
+  config.services.mako.settings = lib.mkIf cfg.enable (
     let
       base16Colors = import ../../colors/base16 { inherit config lib pkgs; };
     in
diff --git a/modules/desktop/niri/assertions.nix b/modules/desktop/niri/assertions.nix
index 99e9d29..626899e 100644
--- a/modules/desktop/niri/assertions.nix
+++ b/modules/desktop/niri/assertions.nix
@@ -1,13 +1,16 @@
 # Validates niri hardware GPU options require desktop to be enabled
 { config, ... }:
+let
+  cfg = config.desktop;
+in
 {
   assertions = [
     {
-      assertion = !config.desktop.hardware.gpu.nvidia.enable || config.desktop.enable;
+      assertion = !cfg.hardware.gpu.nvidia.enable || cfg.enable;
       message = "desktop.hardware.gpu.nvidia.enable requires desktop.enable.";
     }
     {
-      assertion = !config.desktop.hardware.gpu.amd.enable || config.desktop.enable;
+      assertion = !cfg.hardware.gpu.amd.enable || cfg.enable;
       message = "desktop.hardware.gpu.amd.enable requires desktop.enable.";
     }
   ];