modules: move home configuration from flake

This commit is contained in:
Bruno BELANYI 2021-06-25 20:43:19 +02:00
parent 0f17123d09
commit 7a382368e8
3 changed files with 20 additions and 10 deletions

View file

@ -70,13 +70,6 @@
nur.overlay
];
}
home-manager.nixosModules.home-manager
({ config, ... }: {
home-manager.users.${config.my.user.name} = import ./home;
# Nix Flakes compatibility
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
})
# Include generic settings
./modules
# Include bundles of settings

View file

@ -17,6 +17,10 @@
example = "alice";
description = "my username";
};
home = {
enable = my.mkDisableOption "home-manager configuration";
};
};
};
}

View file

@ -1,11 +1,24 @@
# Simplify setting home options
{ config, lib, ... }:
{ config, inputs, lib, ... }:
let
actualPath = [ "home-manager" "users" config.my.user.name "my" "home" ];
aliasPath = [ "my" "home" ];
cfg = config.my.user.home;
in
{
imports = [
(lib.mkAliasOptionModule aliasPath actualPath)
inputs.home-manager.nixosModule # enable home-manager options
(lib.mkAliasOptionModule aliasPath actualPath) # simplify setting home options
];
config = lib.mkIf cfg.enable {
home-manager = {
# Not a fan of out-of-directory imports, but this is a good exception
users.${config.my.user.name} = import ../home;
# Nix Flakes compatibility
useGlobalPkgs = true;
useUserPackages = true;
};
};
}