chore: without loader.scoped

tao3k · Nov 20, 2023 · 4ad8f56 · 4ad8f56
1 parent 9f93122
commit 4ad8f56
Show file tree

Hide file tree

Showing 18 changed files with 93 additions and 3 deletions.
diff --git a/src/__init.nix b/src/__init.nix
@@ -14,7 +14,6 @@ let
 in
 flops.lib.haumea.pops.default.setInit {
   src = ./.;
-  loader = haumea.lib.loaders.scoped;
   inputs = {
     lib = (nixlib.lib.recursiveUpdate nixlib.lib inputs.self.lib) // builtins;
     haumea = haumea.lib;

diff --git a/src/flakeOutputs.nix b/src/flakeOutputs.nix
@@ -2,6 +2,11 @@
 #
 # SPDX-License-Identifier: MIT
 
+{
+  super,
+  root,
+  projectDir,
+}:
 let
   outputs = root.lib.mapPopsExports super.pops;
 in

diff --git a/src/lib/loaderInputs.nix b/src/lib/loaderInputs.nix
@@ -2,6 +2,11 @@
 #
 # SPDX-License-Identifier: MIT
 
+{
+  inputs,
+  root,
+  lib,
+}:
 inputs.self.pops.self.load.inputs
 // {
   omnibus =

diff --git a/src/pops/allData.nix b/src/pops/allData.nix
@@ -2,6 +2,12 @@
 #
 # SPDX-License-Identifier: MIT
 
+{
+  super,
+  root,
+  haumea,
+  flops,
+}:
 (super.data.addLoadExtender {
   load = {
     loader = with haumea; [

diff --git a/src/pops/darwinModules.nix b/src/pops/darwinModules.nix
@@ -2,6 +2,11 @@
 #
 # SPDX-License-Identifier: MIT
 
+{
+  super,
+  projectDir,
+  flops,
+}:
 super.nixosModules.addLoadExtender {
   load.src = projectDir + "/units/nixos/darwinModules";
 }
diff --git a/src/pops/darwinProfiles.nix b/src/pops/darwinProfiles.nix
@@ -2,6 +2,11 @@
 #
 # SPDX-License-Identifier: MIT
 
+{
+  super,
+  projectDir,
+  flops,
+}:
 super.nixosProfiles.addLoadExtender {
   load = {
     src = projectDir + "/units/nixos/darwinProfiles";

diff --git a/src/pops/data.nix b/src/pops/data.nix
@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: MIT
 
+{ haumea, flops }:
 flops.haumea.pops.default.setInit {
   loader = with haumea; [
     matchers.json

diff --git a/src/pops/devshellModules.nix b/src/pops/devshellModules.nix
@@ -2,6 +2,11 @@
 #
 # SPDX-License-Identifier: MIT
 
+{
+  super,
+  projectDir,
+  flops,
+}:
 super.nixosModules.addLoadExtender {
   load = {
     src = projectDir + "/units/devshell/modules";

diff --git a/src/pops/devshellProfiles.nix b/src/pops/devshellProfiles.nix
@@ -2,6 +2,13 @@
 #
 # SPDX-License-Identifier: MIT
 
+{
+  super,
+  projectDir,
+  haumea,
+  lib,
+  inputs,
+}:
 super.nixosProfiles.addLoadExtender {
   load = {
     src = projectDir + "/units/devshell/profiles";

diff --git a/src/pops/flake-parts.nix b/src/pops/flake-parts.nix
@@ -2,6 +2,11 @@
 #
 # SPDX-License-Identifier: MIT
 
+{
+  super,
+  projectDir,
+  flops,
+}:
 {
   modules = super.nixosModules.addLoadExtender {
     load.src = projectDir + "/units/flake-parts/modules";

diff --git a/src/pops/flake.nix b/src/pops/flake.nix
@@ -2,4 +2,5 @@
 #
 # SPDX-License-Identifier: MIT
 
+{ projectDir, flops }:
 flops.flake.pops.default.setInitInputs (projectDir + "/local/lock")
diff --git a/src/pops/homeModules.nix b/src/pops/homeModules.nix
@@ -2,6 +2,15 @@
 #
 # SPDX-License-Identifier: MIT
 
+{
+  root,
+  projectDir,
+  POP,
+  flops,
+  inputs,
+  lib,
+  haumea,
+}:
 (flops.haumea.pops.default.setInit {
   src = projectDir + "/units/nixos/homeModules";
   type = "nixosModules";

diff --git a/src/pops/homeProfiles.nix b/src/pops/homeProfiles.nix
@@ -2,6 +2,13 @@
 #
 # SPDX-License-Identifier: MIT
 
+{
+  super,
+  projectDir,
+  POP,
+  flops,
+  haumea,
+}:
 (super.homeModules.addLoadExtender {
   load = {
     src = projectDir + "/units/nixos/homeProfiles";

diff --git a/src/pops/load.nix b/src/pops/load.nix
@@ -6,6 +6,8 @@
   flops,
   haumea,
   root,
+  POP,
+  lib,
 }:
 let
   inherit (flops) recursiveMerge';

diff --git a/src/pops/nixosModules.nix b/src/pops/nixosModules.nix
@@ -2,6 +2,13 @@
 #
 # SPDX-License-Identifier: MIT
 
+{
+  root,
+  lib,
+  projectDir,
+  POP,
+  flops,
+}:
 (flops.haumea.pops.default.setInit {
   src = projectDir + "/units/nixos/nixosModules";
   type = "nixosModules";

diff --git a/src/pops/nixosProfiles.nix b/src/pops/nixosProfiles.nix
@@ -2,6 +2,12 @@
 #
 # SPDX-License-Identifier: MIT
 
+{
+  super,
+  projectDir,
+  POP,
+  flops,
+}:
 (super.nixosModules.addLoadExtender {
   load = {
     src = projectDir + "/units/nixos/nixosProfiles";
@@ -11,9 +17,9 @@
 }).addExporters
   [
     (POP.extendPop flops.haumea.pops.exporter (
-      _self: _super: {
+      selfExp: _super: {
         exports = {
-          omnibus = super.exportsOmnibusProfiles self;
+          omnibusLayout = super.exportsOmnibusProfiles selfExp.layouts.default;
         };
       }
     ))

diff --git a/src/pops/scripts.nix b/src/pops/scripts.nix
@@ -2,6 +2,13 @@
 #
 # SPDX-License-Identifier: MIT
 
+{
+  super,
+  root,
+  inputs,
+  lib,
+  haumea,
+}:
 let
   inherit (inputs) nixpkgs;
   inherit (root.ops) makes;

diff --git a/src/pops/srvos.nix b/src/pops/srvos.nix
@@ -2,6 +2,14 @@
 #
 # SPDX-License-Identifier: MIT
 
+{
+  super,
+  POP,
+  flops,
+  inputs,
+  lib,
+  haumea,
+}:
 (flops.haumea.pops.default.setInit {
   src = super.flake.inputs.srvos + "/nixos";
   type = "nixosProfiles";