From 0e5b1613bd9285700c99e5ecf0a4e31da8cb5e04 Mon Sep 17 00:00:00 2001 From: awwpotato Date: Fri, 16 May 2025 07:39:50 -0700 Subject: [PATCH] stylix: rename homeManagerModules to homeModules (#1267) Link: https://github.com/danth/stylix/pull/1267 Link: https://github.com/nix-community/home-manager/pull/6406 Reviewed-by: eveeifyeve <88671402+Eveeifyeve@users.noreply.github.com> Reviewed-by: Matt Sturgeon Reviewed-by: NAHO <90870942+trueNAHO@users.noreply.github.com> --- docs/default.nix | 2 +- docs/src/installation.md | 6 +++--- flake.nix | 15 ++++++++++----- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/docs/default.nix b/docs/default.nix index 3f441fc2..41dbd3bc 100644 --- a/docs/default.nix +++ b/docs/default.nix @@ -18,7 +18,7 @@ let homeManagerConfiguration = inputs.home-manager.lib.homeManagerConfiguration { inherit pkgs; modules = [ - inputs.self.homeManagerModules.stylix + inputs.self.homeModules.stylix ./settings.nix { home = { diff --git a/docs/src/installation.md b/docs/src/installation.md index c43a90dc..39693fac 100644 --- a/docs/src/installation.md +++ b/docs/src/installation.md @@ -161,7 +161,7 @@ by someone else. homeConfigurations."«username»" = home-manager.lib.homeManagerConfiguration { pkgs = nixpkgs.legacyPackages.x86_64-linux; modules = [ - stylix.homeManagerModules.stylix + stylix.homeModules.stylix ./home.nix ]; }; @@ -192,7 +192,7 @@ If you haven't enabled flakes yet or don't want to use this feature, enabled. This means that once you have a copy of this repo, using either a local checkout, [niv](https://github.com/nmattia/niv), or any other method, you can import it to get the NixOS module as the `nixosModules.stylix` attribute and the -Home Manager module as the `homeManagerModules.stylix` attribute. +Home Manager module as the `homeModules.stylix` attribute. ```nix let @@ -204,7 +204,7 @@ let }; in { - imports = [ (import stylix).homeManagerModules.stylix ]; + imports = [ (import stylix).homeModules.stylix ]; stylix = { enable = true; diff --git a/flake.nix b/flake.nix index 9942ca09..dfc5a16e 100644 --- a/flake.nix +++ b/flake.nix @@ -259,13 +259,13 @@ paletteGenerator = self.packages.${pkgs.stdenv.hostPlatform.system}.palette-generator; base16 = base16.lib args; - homeManagerIntegration.module = self.homeManagerModules.stylix; + homeManagerIntegration.module = self.homeModules.stylix; }; } ]; }; - homeManagerModules.stylix = + homeModules.stylix = { pkgs, ... }@args: { imports = [ @@ -292,7 +292,7 @@ paletteGenerator = self.packages.${pkgs.stdenv.hostPlatform.system}.palette-generator; base16 = base16.lib args; - homeManagerIntegration.module = self.homeManagerModules.stylix; + homeManagerIntegration.module = self.homeModules.stylix; }; } ]; @@ -308,10 +308,15 @@ paletteGenerator = self.packages.${pkgs.stdenv.hostPlatform.system}.palette-generator; base16 = base16.lib args; - homeManagerIntegration.module = self.homeManagerModules.stylix; + homeManagerIntegration.module = self.homeModules.stylix; }; } ]; }; - }; + } + // + # Drop this alias after 25.11 + nixpkgs.lib.optionalAttrs (!nixpkgs.lib.oldestSupportedReleaseIsAtLeast 2511) { + homeManagerModules = builtins.warn "stylix: flake output `homeManagerModules` has been renamed to `homeModules`" self.homeModules; + }; }