nixos/desktop: streamline

3 files changed, 6 insertions, 9 deletions

diff --git a/modules/nixos/desktop/audio.nix b/modules/nixos/desktop/audio.nix
index 8e0c069..06ce693 100644
--- a/modules/nixos/desktop/audio.nix
+++ b/modules/nixos/desktop/audio.nix
@@ -1,16 +1,15 @@
 { config, lib, ... }:
 let
   cfg = config.desktop.audio;
-  enable = config.desktop.enable && cfg.enable;
 in
 {
   options.desktop.audio = {
     enable = lib.mkEnableOption "desktop audio configuration" // {
-      default = true;
+      default = config.desktop.enable;
     };
   };
 
-  config = lib.mkIf enable {
+  config = lib.mkIf cfg.enable {
     hardware.pulseaudio.enable = false;
     security.rtkit.enable = true;
 
diff --git a/modules/nixos/desktop/fonts.nix b/modules/nixos/desktop/fonts.nix
index f6df64c..d85af17 100644
--- a/modules/nixos/desktop/fonts.nix
+++ b/modules/nixos/desktop/fonts.nix
@@ -6,16 +6,15 @@
 }:
 let
   cfg = config.desktop.fonts;
-  enable = config.desktop.enable && cfg.enable;
 in
 {
   options.desktop.fonts = {
     enable = lib.mkEnableOption "desktop fonts" // {
-      default = true;
+      default = config.desktop.enable;
     };
   };
 
-  config = lib.mkIf enable {
+  config = lib.mkIf cfg.enable {
     fonts = {
       enableDefaultPackages = true;
 
diff --git a/modules/nixos/desktop/programs.nix b/modules/nixos/desktop/programs.nix
index 15ddbcc..4b5f8e1 100644
--- a/modules/nixos/desktop/programs.nix
+++ b/modules/nixos/desktop/programs.nix
@@ -6,16 +6,15 @@
 }:
 let
   cfg = config.desktop.defaultPrograms;
-  enable = config.desktop.enable && cfg.enable;
 in
 {
   options.desktop.defaultPrograms = {
     enable = lib.mkEnableOption "default desktop programs" // {
-      default = true;
+      default = config.desktop.enable;
     };
   };
 
-  config = lib.mkIf enable {
+  config = lib.mkIf cfg.enable {
     environment = {
       noXlibs = lib.mkForce false;
       systemPackages = with pkgs; [