From 666912d61548833c76987f76133bf4c26c0a27c3 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Mon, 29 Jul 2024 16:01:50 +0800 Subject: [PATCH] home-manager/suites: fix conditional for NixOS-enabled parts --- modules/home-manager/_private/suites/desktop.nix | 3 +-- modules/home-manager/_private/suites/dev.nix | 6 +----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/modules/home-manager/_private/suites/desktop.nix b/modules/home-manager/_private/suites/desktop.nix index 5ff1ab2d..8989f02e 100644 --- a/modules/home-manager/_private/suites/desktop.nix +++ b/modules/home-manager/_private/suites/desktop.nix @@ -3,7 +3,6 @@ let cfg = config.suites.desktop; - nixosCfg = attrs.nixosConfig; in { options.suites.desktop = { @@ -14,7 +13,7 @@ in enable = lib.mkEnableOption "installations of audio-related apps"; pipewire.enable = lib.mkOption { type = lib.types.bool; - default = nixosCfg.services.pipewire.enable or false; + default = attrs.nixosConfig.services.pipewire.enable or false; description = '' Enable whether to install Pipewire-related applications. diff --git a/modules/home-manager/_private/suites/dev.nix b/modules/home-manager/_private/suites/dev.nix index accb73dc..5b3400df 100644 --- a/modules/home-manager/_private/suites/dev.nix +++ b/modules/home-manager/_private/suites/dev.nix @@ -93,11 +93,7 @@ in { # Echolocation. Since you're using a home-manager configuration, you're # most likely using Nix anyways. - programs.nix-index.enable = - let - hasNixOSModuleEnabled = attrs ? nixosConfig && lib.attrByPath [ "programs" "nix-index" "enable" ] false attrs.nixosConfig; - in - !hasNixOSModuleEnabled; + programs.nix-index.enable = !attrs.nixosConfig.programs.nix-index.enable or false; }) # Level up your terminal-dwelling skills with these.