From fb6c1ad004601c0b84a16532fddd232311a4b4c3 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Mon, 22 Jan 2024 14:50:00 +0800 Subject: [PATCH] home-manager/suites: make use of `nixosConfig` instead of `osConfig` --- modules/home-manager/_private/profiles/desktop.nix | 8 ++++---- modules/home-manager/_private/profiles/dev.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/home-manager/_private/profiles/desktop.nix b/modules/home-manager/_private/profiles/desktop.nix index 023dd373..bcb38b8b 100644 --- a/modules/home-manager/_private/profiles/desktop.nix +++ b/modules/home-manager/_private/profiles/desktop.nix @@ -13,7 +13,7 @@ in enable = lib.mkEnableOption "installations of audio-related apps"; pipewire.enable = lib.mkOption { type = lib.types.bool; - default = attrs ? osConfig && lib.attrByPath [ "services" "pipewire" "enable" ] false attrs.osConfig; + default = attrs ? nixosConfig && lib.attrByPath [ "services" "pipewire" "enable" ] false attrs.nixosConfig; description = '' Enable whether to install Pipewire-related applications. @@ -43,7 +43,7 @@ in ] ++ ( let - hasBlenderNixOSModule = attrs ? osConfig && lib.attrByPath [ "programs" "blender" "enable" ] false attrs.osConfig; + hasBlenderNixOSModule = attrs ? nixosConfig && lib.attrByPath [ "programs" "blender" "enable" ] false attrs.nixosConfig; in lib.optional (!hasBlenderNixOSModule) pkgs.blender ); @@ -61,7 +61,7 @@ in ] ++ ( let - hasWineProfile = attrs ? osConfig && lib.attrByPath [ "profiles" "desktop" "wine" "enable" ] false attrs.osConfig; + hasWineProfile = attrs ? nixosConfig && lib.attrByPath [ "profiles" "desktop" "wine" "enable" ] false attrs.nixosConfig; in lib.optionals hasWineProfile (with pkgs; [ yabridge # Building bridges to Windows and Linux audio tools. @@ -77,7 +77,7 @@ in enable = true; soundService = let - hasNixOSPipewirePulseEnabled = attrs ? osConfig && lib.attrByPath [ "services" "pipewire" "pulse" "enable" ] false attrs.osConfig; + hasNixOSPipewirePulseEnabled = attrs ? nixosConfig && lib.attrByPath [ "services" "pipewire" "pulse" "enable" ] false attrs.nixosConfig; in lib.mkIf hasNixOSPipewirePulseEnabled "pipewire-pulse"; }; diff --git a/modules/home-manager/_private/profiles/dev.nix b/modules/home-manager/_private/profiles/dev.nix index 52613db5..adc7beef 100644 --- a/modules/home-manager/_private/profiles/dev.nix +++ b/modules/home-manager/_private/profiles/dev.nix @@ -87,7 +87,7 @@ in { # most likely using Nix anyways. programs.nix-index.enable = let - hasNixOSModuleEnabled = attrs ? osConfig && lib.attrByPath [ "programs" "nix-index" "enable" ] false attrs.osConfig; + hasNixOSModuleEnabled = attrs ? nixosConfig && lib.attrByPath [ "programs" "nix-index" "enable" ] false attrs.nixosConfig; in !hasNixOSModuleEnabled; })