diff --git a/nix/configurations.nix b/nix/configurations.nix index a2ac765..ab03cf9 100644 --- a/nix/configurations.nix +++ b/nix/configurations.nix @@ -14,7 +14,7 @@ let useGlobalPkgs = true; useUserPackages = true; sharedModules = [ cfg.modules.homeManager.default ]; - users = forAllUsers' (name: _: cfg.homes.${name}); + users = forAllUsers' (name: _: cfg.modules.homeManager.${name}); }; hosts = cfg.manifest.hosts or { }; mkConfigurations = diff --git a/nix/homes/rafiq/default.nix b/nix/homes/rafiq/default.nix index c46af80..02cdd25 100644 --- a/nix/homes/rafiq/default.nix +++ b/nix/homes/rafiq/default.nix @@ -3,7 +3,7 @@ let inherit (lib.strings) concatStrings; in { - flake.homes.rafiq = + flake.modules.homeManager.rafiq = { pkgs, ... }: { imports = [ diff --git a/nix/homes/rafiq/desktop/default.nix b/nix/homes/rafiq/desktop/default.nix index 0e4bf07..9d03045 100644 --- a/nix/homes/rafiq/desktop/default.nix +++ b/nix/homes/rafiq/desktop/default.nix @@ -4,7 +4,7 @@ "stremio-shell" "stremio-server" ]; - flake.homes.rafiq = + flake.modules.homeManager.rafiq = { pkgs, config, ... }: let inherit (lib.modules) mkMerge mkIf; diff --git a/nix/homes/rafiq/git.nix b/nix/homes/rafiq/git.nix index 62bb79b..7d4d6fd 100644 --- a/nix/homes/rafiq/git.nix +++ b/nix/homes/rafiq/git.nix @@ -1,5 +1,5 @@ { - flake.homes.rafiq = { + flake.modules.homeManager.rafiq = { home.shellAliases = { gs = "git status"; gc = "git commit"; diff --git a/nix/meta.nix b/nix/meta.nix index f9d41ae..5fee0c7 100644 --- a/nix/meta.nix +++ b/nix/meta.nix @@ -66,10 +66,6 @@ in readOnly = true; }; }; - homes = mkOption { - type = lazyAttrsOf deferredModule; - default = { }; - }; manifest = mkOption { type = submodule { options = {