diff --git a/flake.nix b/flake.nix index 75aea21..1ba900d 100644 --- a/flake.nix +++ b/flake.nix @@ -158,6 +158,43 @@ finalPackages = filterPackages system flattenedPackages; in finalPackages; + + # Work-around for https://github.com/nix-community/home-manager/issues/3075 + legacyPackages = { + homeConfigurations = { + ambroisie = home-manager.lib.homeManagerConfiguration { + # Work-around for home-manager + # * not letting me set `lib` as an extraSpecialArgs + # * not respecting `nixpkgs.overlays` [1] + # [1]: https://github.com/nix-community/home-manager/issues/2954 + pkgs = import nixpkgs { + inherit system; + + overlays = (lib.attrValues self.overlays) ++ [ + nur.overlay + ]; + }; + + modules = [ + ./home + { + # The basics + home.username = "ambroisie"; + home.homeDirectory = "/home/ambroisie"; + # Let Home Manager install and manage itself. + programs.home-manager.enable = true; + # This is a generic linux install + targets.genericLinux.enable = true; + } + ]; + + extraSpecialArgs = { + # Inject inputs to use them in global registry + inherit inputs; + }; + }; + }; + }; }) // { overlays = import ./overlays // { lib = final: prev: { inherit lib; }; @@ -165,39 +202,6 @@ ambroisie = prev.recurseIntoAttrs (import ./pkgs { pkgs = prev; }); }; }; - homeConfigurations = - let - system = "x86_64-linux"; - pkgs = import nixpkgs { - inherit system; - overlays = (lib.attrValues self.overlays) ++ [ - nur.overlay - ]; - }; - in - { - ambroisie = home-manager.lib.homeManagerConfiguration { - inherit pkgs; - - modules = [ - ./home - { - # The basics - home.username = "ambroisie"; - home.homeDirectory = "/home/ambroisie"; - # Let Home Manager install and manage itself. - programs.home-manager.enable = true; - # This is a generic linux install - targets.genericLinux.enable = true; - } - ]; - - extraSpecialArgs = { - # Inject inputs to use them in global registry - inherit inputs; - }; - }; - }; nixosConfigurations = lib.mapAttrs buildHost { aramis = "x86_64-linux";