diff --git a/examples/nixos/default.nix b/examples/nixos/default.nix index a840e61..f814db3 100644 --- a/examples/nixos/default.nix +++ b/examples/nixos/default.nix @@ -14,7 +14,7 @@ in exporter.nixosProfiles.customProfiles.nix exporter.nixosProfiles.customProfiles.boot - (selfLib.mkHome + (POS.lib.mkHome { admin = { uid = 1000; diff --git a/examples/nixos/pops/homeModules.nix b/examples/nixos/pops/homeModules.nix index bcddadb..69c11df 100644 --- a/examples/nixos/pops/homeModules.nix +++ b/examples/nixos/pops/homeModules.nix @@ -1,4 +1,4 @@ -(loadHomeModules.addLoadExtender { inputs = super.inputs.outputs // { }; }) +(POS.loadHomeModules.addLoadExtender { inputs = super.inputs.outputs // { }; }) .addExporters [ (POP.extendPop flops.haumea.pops.exporter ( diff --git a/examples/nixos/pops/homeProfiles.nix b/examples/nixos/pops/homeProfiles.nix index 71102d6..814cc1f 100644 --- a/examples/nixos/pops/homeProfiles.nix +++ b/examples/nixos/pops/homeProfiles.nix @@ -1,4 +1,4 @@ -(loadHomeProfiles.addLoadExtender { +(POS.loadHomeProfiles.addLoadExtender { inputs = super.inputs.outputs // { POS = { homeModules = super.homeModules.outputsForTarget.nixosModules; diff --git a/examples/nixos/pops/inputs.nix b/examples/nixos/pops/inputs.nix index 1bd8d8e..f829692 100644 --- a/examples/nixos/pops/inputs.nix +++ b/examples/nixos/pops/inputs.nix @@ -1,4 +1,4 @@ -(loadInputs.addInputsExtender ( +(POS.loadInputs.addInputsExtender ( POP.extendPop flops.flake.pops.inputsExtender ( self: super: { inputs.nixpkgs = nixpkgs.legacyPackages; } ) diff --git a/examples/nixos/pops/nixosModules.nix b/examples/nixos/pops/nixosModules.nix index 7351cfc..6eee7ca 100644 --- a/examples/nixos/pops/nixosModules.nix +++ b/examples/nixos/pops/nixosModules.nix @@ -1,4 +1,4 @@ -(loadNixOSModules.addLoadExtender { inputs = super.inputs.outputs // { }; }) +(POS.loadNixOSModules.addLoadExtender { inputs = super.inputs.outputs // { }; }) .addExporters [ (POP.extendPop flops.haumea.pops.exporter ( diff --git a/examples/nixos/pops/nixosProfiles.nix b/examples/nixos/pops/nixosProfiles.nix index 8e3e30e..5361dd5 100644 --- a/examples/nixos/pops/nixosProfiles.nix +++ b/examples/nixos/pops/nixosProfiles.nix @@ -1,4 +1,4 @@ -(loadNixOSProfiles.addLoadExtender { +(POS.loadNixOSProfiles.addLoadExtender { inputs = super.inputs.outputs // { POS = { nixosModules = super.nixosModules.outputsForTarget.nixosModules; diff --git a/flake.nix b/flake.nix index 1475510..77045ba 100644 --- a/flake.nix +++ b/flake.nix @@ -65,20 +65,22 @@ loader = with haumea.lib; loaders.scoped; src = ./examples; inputs = { - inherit - loadNixOSModules - loadHomeModules - loadHomeProfiles - loadNixOSProfiles - loadInputs - nixpkgs - ; + inherit nixpkgs; lib = nixpkgs.lib // builtins; flops = flops.lib; haumea = flops.inputs.haumea.lib; dmerge = flops.inputs.dmerge; POP = POP.lib; - selfLib = lib.outputsForTarget.default; + POS = { + lib = lib.outputsForTarget.default; + inherit + loadNixOSModules + loadHomeModules + loadHomeProfiles + loadNixOSProfiles + loadInputs + ; + }; }; }; nixosConfigurations =