From b325840b4afae3bc51806288837101821d1467bf Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Thu, 13 Jun 2024 13:10:45 +0800 Subject: [PATCH] flake-parts/setups: update shared options as a proper alias --- modules/flake-parts/setups/shared/home-manager-users.nix | 6 +++--- modules/flake-parts/setups/shared/nixpkgs-options.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/flake-parts/setups/shared/home-manager-users.nix b/modules/flake-parts/setups/shared/home-manager-users.nix index ef108b06..2d634015 100644 --- a/modules/flake-parts/setups/shared/home-manager-users.nix +++ b/modules/flake-parts/setups/shared/home-manager-users.nix @@ -20,9 +20,9 @@ in # with the home-manager flake-parts module where it also shares the Nix # configuration submodule. Without this option, it would not work (or we # could just rename the options from the home-manager module). - options.homeManagerBranch = options.home-manager.branch // { - default = config.home-manager.branch; - }; + imports = [ + (lib.mkAliasOptionModule [ "homeManagerBranch" ] [ "home-manager" "branch" ]) + ]; options.home-manager = { branch = lib.mkOption { diff --git a/modules/flake-parts/setups/shared/nixpkgs-options.nix b/modules/flake-parts/setups/shared/nixpkgs-options.nix index 1a77e5e9..f5b9cb79 100644 --- a/modules/flake-parts/setups/shared/nixpkgs-options.nix +++ b/modules/flake-parts/setups/shared/nixpkgs-options.nix @@ -3,9 +3,9 @@ { # A compatibility option while the newer iteration of configuring nixpkgs # inside our internal flake-parts module is in progress. - options.nixpkgsBranch = options.nixpkgs.branch // { - default = config.nixpkgs.branch; - }; + imports = [ + (lib.mkAliasOptionModule [ "nixpkgsBranch" ] [ "nixpkgs" "branch" ]) + ]; options.nixpkgs = { branch = lib.mkOption {