From 3d9494d92a6fd344d4e734bda473247693db5ee9 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Sat, 9 Jul 2022 07:08:27 +0800 Subject: [PATCH] flake.nix: update default NixOS config with home-manager options --- flake.nix | 10 ++++++++++ modules/nixos/profiles/users.nix | 6 ------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index deb749f3..75e86329 100644 --- a/flake.nix +++ b/flake.nix @@ -174,6 +174,16 @@ nix.extraOptions = '' experimental-features = nix-command flakes ''; + + # The global configuration for the home-manager module. + home-manager.useUserPackages = true; + home-manager.useGlobalPkgs = true; + home-manager.sharedModules = + lib'.modulesToList (lib'.filesToAttr ./modules/home-manager); + home-manager.extraSpecialArgs = { + lib = lib'; + inherit inputs system self; + }; }; mkUser = { system ? defaultSystem, extraModules ? [ ] }: diff --git a/modules/nixos/profiles/users.nix b/modules/nixos/profiles/users.nix index 5cddcb72..dd6a22e6 100644 --- a/modules/nixos/profiles/users.nix +++ b/modules/nixos/profiles/users.nix @@ -65,12 +65,6 @@ in { } is not found in the `./users/home-manager` directory."; }]; - # The global configuration for the home-manager module. - home-manager.useUserPackages = true; - home-manager.useGlobalPkgs = true; - home-manager.sharedModules = lib.modulesToList homeManagerModules; - home-manager.extraSpecialArgs = { inherit inputs; }; - # Mapping each users to the respective user configuration. # Setting users for home-manager. home-manager.users = mapUsers (user: _: