From 763958b2acd86508ee733bb9e610ff35048d2d0e Mon Sep 17 00:00:00 2001
From: Dmitriy Kholkin <ataraxiadev@ataraxiadev.com>
Date: Thu, 10 Jul 2025 18:31:51 +0300
Subject: [PATCH] feat: fix home-manager detection in modules

---
 modules/nixos/applications/corectrl.nix         |  4 ++--
 modules/nixos/applications/steam.nix            |  4 ++--
 modules/nixos/applications/waydroid.nix         |  4 ++--
 modules/nixos/virtualisation/virtualisation.nix | 10 +++-------
 modules/nixos/workspace/wayland.nix             | 10 +++++++---
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/modules/nixos/applications/corectrl.nix b/modules/nixos/applications/corectrl.nix
index e47c0fd..92640da 100644
--- a/modules/nixos/applications/corectrl.nix
+++ b/modules/nixos/applications/corectrl.nix
@@ -2,10 +2,10 @@
   config,
   lib,
   pkgs,
+  useHomeManager,
   ...
 }:
 let
-  inherit (builtins) hasAttr;
   inherit (lib) mkEnableOption mkIf;
   cfg = config.ataraxia.programs.corectrl;
   defaultUser = config.ataraxia.defaults.users.defaultUser;
@@ -22,7 +22,7 @@ in
       # gpuOverclock.ppfeaturemask = "0xffffffff";
     };
 
-    home-manager = mkIf (hasAttr "users" config.home-manager) {
+    home-manager = mkIf useHomeManager {
       users.${defaultUser} = {
         startupApplications = [ "${pkgs.corectrl}/bin/corectrl" ];
         persist.state.directories = [ ".config/corectrl" ];
diff --git a/modules/nixos/applications/steam.nix b/modules/nixos/applications/steam.nix
index f10a3d5..6abca7b 100644
--- a/modules/nixos/applications/steam.nix
+++ b/modules/nixos/applications/steam.nix
@@ -2,10 +2,10 @@
   config,
   lib,
   pkgs,
+  useHomeManager,
   ...
 }:
 let
-  inherit (builtins) hasAttr;
   inherit (lib) mkEnableOption mkIf;
   cfg = config.ataraxia.programs.steam;
   defaultUser = config.ataraxia.defaults.users.defaultUser;
@@ -43,7 +43,7 @@ in
     };
     programs.steam.gamescopeSession.args = [ "--adaptive-sync" ];
 
-    home-manager = mkIf (hasAttr "users" config.home-manager) {
+    home-manager = mkIf useHomeManager {
       users.${defaultUser} = {
         startupApplications = [ "${config.programs.steam.package}/bin/steam" ];
         persist.state.directories = [ ".local/share/Steam" ];
diff --git a/modules/nixos/applications/waydroid.nix b/modules/nixos/applications/waydroid.nix
index 5945c3e..96ed713 100644
--- a/modules/nixos/applications/waydroid.nix
+++ b/modules/nixos/applications/waydroid.nix
@@ -2,10 +2,10 @@
   config,
   lib,
   pkgs,
+  useHomeManager,
   ...
 }:
 let
-  inherit (builtins) hasAttr;
   inherit (lib) mkEnableOption mkIf;
   cfg = config.ataraxia.programs.waydroid;
   defaultUser = config.ataraxia.defaults.users.defaultUser;
@@ -21,7 +21,7 @@ in
 
     persist.state.directories = [ "/var/lib/waydroid" ];
 
-    home-manager = mkIf (hasAttr "users" config.home-manager) {
+    home-manager = mkIf useHomeManager {
       users.${defaultUser} = {
         home.packages = with pkgs; [ waydroid-script ];
         persist.state.directories = [
diff --git a/modules/nixos/virtualisation/virtualisation.nix b/modules/nixos/virtualisation/virtualisation.nix
index 8cf0853..3652369 100644
--- a/modules/nixos/virtualisation/virtualisation.nix
+++ b/modules/nixos/virtualisation/virtualisation.nix
@@ -2,15 +2,11 @@
   config,
   lib,
   pkgs,
+  useHomeManager,
   ...
 }:
 let
-  inherit (lib)
-    hasAttr
-    mkEnableOption
-    mkIf
-    optionals
-    ;
+  inherit (lib) mkEnableOption mkIf optionals;
   cfg = config.ataraxia.virtualisation;
 
   defaultUser = config.ataraxia.defaults.users.defaultUser;
@@ -108,7 +104,7 @@ in
       "/var/lib/containers"
     ];
 
-    home-manager = mkIf (hasAttr "users" config.home-manager) {
+    home-manager = mkIf useHomeManager {
       users.${defaultUser} = {
         home.file.".config/containers/storage.conf".text = ''
           [storage]
diff --git a/modules/nixos/workspace/wayland.nix b/modules/nixos/workspace/wayland.nix
index 7c44eae..49fd9db 100644
--- a/modules/nixos/workspace/wayland.nix
+++ b/modules/nixos/workspace/wayland.nix
@@ -1,6 +1,10 @@
-{ config, lib, ... }:
+{
+  config,
+  lib,
+  useHomeManager,
+  ...
+}:
 let
-  inherit (builtins) hasAttr;
   inherit (lib) getExe mkEnableOption mkIf;
   cfg = config.ataraxia.wayland;
 
@@ -31,7 +35,7 @@ in
       };
     };
 
-    home-manager = mkIf (hasAttr "users" config.home-manager) {
+    home-manager = mkIf useHomeManager {
       users.${defaultUser} = {
         ataraxia.wayland.hyprland.enable = cfg.hyprland.enable;
       };