From ce67ffbf73d79ad61e9b721f7b72ce99357a98ca Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Thu, 18 Jul 2024 19:41:23 -0400 Subject: [PATCH] meta: Rename homeManagerModules attribute to homeModules This fixes an issue where previously homeManagerModules would be an unknown flake output. Note that this change is a part of Nix 2.22.3 but not Nix 2.23.3. --- containers/default.nix | 2 +- example/configuration.nix | 2 +- flake.nix | 2 +- hosts/laptop/configuration.nix | 2 +- hosts/phone/configuration.nix | 2 +- tests/neovim.nix | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/containers/default.nix b/containers/default.nix index eff01ab1..487ee72d 100644 --- a/containers/default.nix +++ b/containers/default.nix @@ -13,7 +13,7 @@ in }; home-manager.sharedModules = attrValues { - inherit (nix-config.homeManagerModules) + inherit (nix-config.homeModules) fish git gtk diff --git a/example/configuration.nix b/example/configuration.nix index 65f0ab32..adb0a792 100644 --- a/example/configuration.nix +++ b/example/configuration.nix @@ -13,7 +13,7 @@ in }; }; - home-manager.sharedModules = attrValues nix-config.homeManagerModules ++ singleton { + home-manager.sharedModules = attrValues nix-config.homeModules ++ singleton { programs.btop.enable = true; }; diff --git a/flake.nix b/flake.nix index 002dfab1..9d3c5226 100644 --- a/flake.nix +++ b/flake.nix @@ -32,7 +32,7 @@ inherit (nixpkgs.legacyPackages) x86_64-linux aarch64-linux; inherit (builtins) attrNames listToAttrs map replaceStrings readDir; - flakeOutputs = [ "overlays" "nixosModules" "homeManagerModules" "packages" "checks" ]; + flakeOutputs = [ "overlays" "nixosModules" "homeModules" "packages" "checks" ]; flakeDirectories = [ "overlays" "modules" "home" "packages" "tests" ]; in { diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix index ef53c8d6..5c7d597e 100644 --- a/hosts/laptop/configuration.nix +++ b/hosts/laptop/configuration.nix @@ -6,7 +6,7 @@ in { imports = attrValues self.nixosModules; nixpkgs.overlays = attrValues self.overlays; - home-manager.sharedModules = attrValues self.homeManagerModules; + home-manager.sharedModules = attrValues self.homeModules; environment.systemPackages = attrValues self.packages.${pkgs.system}; modules = { diff --git a/hosts/phone/configuration.nix b/hosts/phone/configuration.nix index 135b6984..be8c7de8 100644 --- a/hosts/phone/configuration.nix +++ b/hosts/phone/configuration.nix @@ -20,7 +20,7 @@ in }; home-manager.sharedModules = attrValues { - inherit (self.homeManagerModules) + inherit (self.homeModules) alacritty eza fish diff --git a/tests/neovim.nix b/tests/neovim.nix index e088360d..6099ca89 100644 --- a/tests/neovim.nix +++ b/tests/neovim.nix @@ -14,7 +14,7 @@ in }; home-manager.sharedModules = attrValues { - inherit (nix-config.homeManagerModules) neovim; + inherit (nix-config.homeModules) neovim; }; };