AtaraxiaDev/nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat: fix home-manager detection in modules

Browse Source
This commit is contained in:
Dmitriy Kholkin 2025-07-10 18:31:51 +03:00
parent caea7cc34c
commit 763958b2ac
Signed by: AtaraxiaDev
GPG Key ID: FD266B810DF48DF2
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/nixos/applications/corectrl.nix
View File

@ -2,10 +2,10 @@
config, config,
lib, lib,
pkgs, pkgs,
useHomeManager,
... ...
}: }:
let let
inherit (builtins) hasAttr;
inherit (lib) mkEnableOption mkIf; inherit (lib) mkEnableOption mkIf;
cfg = config.ataraxia.programs.corectrl; cfg = config.ataraxia.programs.corectrl;
defaultUser = config.ataraxia.defaults.users.defaultUser; defaultUser = config.ataraxia.defaults.users.defaultUser;
@ -22,7 +22,7 @@ in
# gpuOverclock.ppfeaturemask = "0xffffffff"; # gpuOverclock.ppfeaturemask = "0xffffffff";
}; };
home-manager = mkIf (hasAttr "users" config.home-manager) { home-manager = mkIf useHomeManager {
users.${defaultUser} = { users.${defaultUser} = {
startupApplications = [ "${pkgs.corectrl}/bin/corectrl" ]; startupApplications = [ "${pkgs.corectrl}/bin/corectrl" ];
persist.state.directories = [ ".config/corectrl" ]; persist.state.directories = [ ".config/corectrl" ];

4
modules/nixos/applications/steam.nix
View File

@ -2,10 +2,10 @@
config, config,
lib, lib,
pkgs, pkgs,
useHomeManager,
... ...
}: }:
let let
inherit (builtins) hasAttr;
inherit (lib) mkEnableOption mkIf; inherit (lib) mkEnableOption mkIf;
cfg = config.ataraxia.programs.steam; cfg = config.ataraxia.programs.steam;
defaultUser = config.ataraxia.defaults.users.defaultUser; defaultUser = config.ataraxia.defaults.users.defaultUser;
@ -43,7 +43,7 @@ in
}; };
programs.steam.gamescopeSession.args = [ "--adaptive-sync" ]; programs.steam.gamescopeSession.args = [ "--adaptive-sync" ];
home-manager = mkIf (hasAttr "users" config.home-manager) { home-manager = mkIf useHomeManager {
users.${defaultUser} = { users.${defaultUser} = {
startupApplications = [ "${config.programs.steam.package}/bin/steam" ]; startupApplications = [ "${config.programs.steam.package}/bin/steam" ];
persist.state.directories = [ ".local/share/Steam" ]; persist.state.directories = [ ".local/share/Steam" ];

4
modules/nixos/applications/waydroid.nix
View File

@ -2,10 +2,10 @@
config, config,
lib, lib,
pkgs, pkgs,
useHomeManager,
... ...
}: }:
let let
inherit (builtins) hasAttr;
inherit (lib) mkEnableOption mkIf; inherit (lib) mkEnableOption mkIf;
cfg = config.ataraxia.programs.waydroid; cfg = config.ataraxia.programs.waydroid;
defaultUser = config.ataraxia.defaults.users.defaultUser; defaultUser = config.ataraxia.defaults.users.defaultUser;
@ -21,7 +21,7 @@ in
persist.state.directories = [ "/var/lib/waydroid" ]; persist.state.directories = [ "/var/lib/waydroid" ];
home-manager = mkIf (hasAttr "users" config.home-manager) { home-manager = mkIf useHomeManager {
users.${defaultUser} = { users.${defaultUser} = {
home.packages = with pkgs; [ waydroid-script ]; home.packages = with pkgs; [ waydroid-script ];
persist.state.directories = [ persist.state.directories = [

10
modules/nixos/virtualisation/virtualisation.nix
View File

@ -2,15 +2,11 @@
config, config,
lib, lib,
pkgs, pkgs,
useHomeManager,
... ...
}: }:
let let
inherit (lib) inherit (lib) mkEnableOption mkIf optionals;
hasAttr
mkEnableOption
mkIf
optionals
;
cfg = config.ataraxia.virtualisation; cfg = config.ataraxia.virtualisation;
defaultUser = config.ataraxia.defaults.users.defaultUser; defaultUser = config.ataraxia.defaults.users.defaultUser;
@ -108,7 +104,7 @@ in
"/var/lib/containers" "/var/lib/containers"
]; ];
home-manager = mkIf (hasAttr "users" config.home-manager) { home-manager = mkIf useHomeManager {
users.${defaultUser} = { users.${defaultUser} = {
home.file.".config/containers/storage.conf".text = '' home.file.".config/containers/storage.conf".text = ''
[storage] [storage]

10
modules/nixos/workspace/wayland.nix
View File

@ -1,6 +1,10 @@
{ config, lib, ... }: {
config,
lib,
useHomeManager,
...
}:
let let
inherit (builtins) hasAttr;
inherit (lib) getExe mkEnableOption mkIf; inherit (lib) getExe mkEnableOption mkIf;
cfg = config.ataraxia.wayland; cfg = config.ataraxia.wayland;
@ -31,7 +35,7 @@ in
}; };
}; };
home-manager = mkIf (hasAttr "users" config.home-manager) { home-manager = mkIf useHomeManager {
users.${defaultUser} = { users.${defaultUser} = {
ataraxia.wayland.hyprland.enable = cfg.hyprland.enable; ataraxia.wayland.hyprland.enable = cfg.hyprland.enable;
}; };