aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/default.nix9
-rw-r--r--modules/home/default.nix28
2 files changed, 1 insertions, 36 deletions
diff --git a/modules/default.nix b/modules/default.nix
index 0885f69..96e66fb 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,7 +1,7 @@
{ lib, ... }:
{
- imports = [ ./hardware ./system ./services ./home ./programs ./secrets ];
+ imports = [ ./hardware ./system ./services ./programs ./secrets ];
options.my = with lib; {
user = {
@@ -11,13 +11,6 @@
example = "franck";
description = "my username";
};
-
- home = {
- enable = mkEnableOption {
- description = "home-manager configuration";
- default = true;
- };
- };
};
};
}
diff --git a/modules/home/default.nix b/modules/home/default.nix
deleted file mode 100644
index d90e6d2..0000000
--- a/modules/home/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ config, inputs, lib, ... }:
-let
- actualPath = [ "home-manager" "users" config.my.user.name "my" "home" ];
- aliasPath = [ "my" "home" ];
-
- cfg = config.my.user.home;
-in
-{
- imports = [
- inputs.home-manager.nixosModule # enable home-manager options
- (lib.mkAliasOptionModule aliasPath
- actualPath) # simplify setting home options
- ];
-
- config = {
- 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;
-
- # Forward inputs to home-manager configuration
- extraSpecialArgs = { inherit inputs; };
- };
- };
-}