Skip to content

Commit

Permalink
refactor: reorg the path struct
Browse files Browse the repository at this point in the history
  • Loading branch information
GTrunSec committed Nov 4, 2023
1 parent 6c3c230 commit b057d85
Show file tree
Hide file tree
Showing 27 changed files with 137 additions and 137 deletions.
117 changes: 0 additions & 117 deletions lib/pops.nix

This file was deleted.

10 changes: 10 additions & 0 deletions lib/pops/allData.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
(super.data.addLoadExtender {
load = {
loader = with haumea; [
(matchers.regex "^(.+)\\.(yaml|yml)$" (
_: _: path:
root.readYAML path
))
];
};
})
4 changes: 4 additions & 0 deletions lib/pops/configs.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
flops.haumea.pops.default.setInit {
src = inputs.self.outPath + "/units/configs";
inputs = omnibus.pops.lib.load.inputs;
}
3 changes: 3 additions & 0 deletions lib/pops/darwinModules.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
super.nixosModules.addLoadExtender {
load.src = inputs.self.outPath + "/units/nixos/darwinModules";
}
5 changes: 5 additions & 0 deletions lib/pops/darwinProfiles.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
super.nixosProfiles.addLoadExtender {
load = {
src = inputs.self.outPath + "/units/nixos/darwinProfiles";
};
}
6 changes: 6 additions & 0 deletions lib/pops/data.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
flops.haumea.pops.default.setInit {
loader = with haumea; [
matchers.json
matchers.toml
];
}
6 changes: 6 additions & 0 deletions lib/pops/devshellModules.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
super.nixosModules.addLoadExtender {
load = {
src = inputs.self.outPath + "/units/devshell/modules";
type = "nixosModules";
};
}
6 changes: 6 additions & 0 deletions lib/pops/devshellProfiles.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
super.nixosProfiles.addLoadExtender {
load = {
src = inputs.self.outPath + "/units/devshell/profiles";
type = "nixosProfiles";
};
}
10 changes: 10 additions & 0 deletions lib/pops/flake-parts.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
modules = super.nixosModules.addLoadExtender {
load.src = inputs.self.outPath + "/units/flake-parts/modules";
};
profiles = super.nixosProfiles.addLoadExtender {
load = {
src = inputs.self.outPath + "/units/flake-parts/profiles";
};
};
}
1 change: 1 addition & 0 deletions lib/pops/flake.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
flops.flake.pops.default.setInitInputs (inputs.self.outPath + "/local/lock")
5 changes: 5 additions & 0 deletions lib/pops/homeModules.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
flops.haumea.pops.default.setInit {
src = inputs.self.outPath + "/units/nixos/homeModules";
type = "nixosModules";
inputs = omnibus.pops.lib.load.inputs;
}
7 changes: 7 additions & 0 deletions lib/pops/homeProfiles.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
super.homeModules.addLoadExtender {
load = {
src = inputs.self.outPath + "/units/nixos/homeProfiles";
type = "nixosProfiles";
transformer = [ (_: _: _) ];
};
}
11 changes: 11 additions & 0 deletions lib/pops/load.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
flops,
omnibus,
haumea,
}:
load:
(flops.haumea.pops.default.setInit {
loader = with haumea; [ (matchers.nix loaders.scoped) ];
inputs = omnibus.pops.lib.load.inputs;
}).addLoadExtender
{ inherit load; }
5 changes: 5 additions & 0 deletions lib/pops/nixosModules.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
flops.haumea.pops.default.setInit {
src = inputs.self.outPath + "/units/nixos/nixosModules";
type = "nixosModules";
inputs = omnibus.pops.lib.load.inputs;
}
7 changes: 7 additions & 0 deletions lib/pops/nixosProfiles.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
super.nixosModules.addLoadExtender {
load = {
src = inputs.self.outPath + "/units/nixos/nixosProfiles";
type = "nixosProfiles";
transformer = [ (_: _: _) ];
};
}
8 changes: 8 additions & 0 deletions lib/pops/scripts.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
(super.load {
inputs = {
inherit (inputs) nixpkgs;
inherit (root.makes) makeScript;
};
loader = with haumea; [ (matchers.nix loaders.scoped) ];
transformer = [ (_cursor: dir: if dir ? default then dir.default else dir) ];
})
6 changes: 6 additions & 0 deletions lib/pops/srvos.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
flops.haumea.pops.default.setInit {
src = super.flake.inputs.srvos + "/nixos";
type = "nixosProfiles";
# reset the transformer to the default
transformer = [ (_: _: _) ];
}
6 changes: 3 additions & 3 deletions templates/nixos/flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions tests/_snapshots/makes
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
#pretty
{
makeScript = <function, args: {aliases?, entrypoint, globalState?, help?, name, persistState?, replace?, searchPaths?}>;
scripts = {
example = <derivation runScriptWithEnv>;
};
}
9 changes: 4 additions & 5 deletions tests/darwin/expr.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,19 @@
omnibus,
}:
let
exporter = root.nixos.pops.exports.default;
out = root.nixos.pops.exports.default;
in
{
darwinFontProfile =
(exporter.layouts.darwinConfiguration [
(out.layouts.darwinConfiguration [
omnibus.darwinProfiles.presets.homebrew
omnibus.darwinProfiles.presets.nix.default
{ homebrew.__profiles__.enableFonts = true; }
]).config.homebrew.casks;

darwinNixProfile =
(exporter.layouts.darwinConfiguration [
omnibus.darwinProfiles.presets.nix.default
]).config.nix.extraOptions;
(out.layouts.darwinConfiguration [ omnibus.darwinProfiles.presets.nix.default ])
.config.nix.extraOptions;
}

// lib.optionalAttrs trace { }
6 changes: 6 additions & 0 deletions tests/makes/__fixture/example/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
makeScript {
name = "runScriptWithEnv";
searchPaths.bin = [ nixpkgs.awscli ];
searchPaths.source = [ ./env ];
entrypoint = ./entrypoint.sh;
}
1 change: 1 addition & 0 deletions tests/makes/__fixture/example/entrypoint.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
awscli --help
3 changes: 3 additions & 0 deletions tests/makes/__fixture/example/env
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
VAST_PEERED_VPC_ID=placeholder
VAST_CIDR=palceholder
VAST_AWS_REGION=placeholder
15 changes: 11 additions & 4 deletions tests/makes/expr.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ omnibus, lib }:
let
inherit (omnibus.flake.inputs) nixpkgs makes;
makesLib =
omnibusLib =
(omnibus.pops.lib.addLoadExtender {
load = {
inputs = {
Expand All @@ -11,10 +11,17 @@ let
};
};
};
}).exports.default.makes;
}).exports.default;

inherit (makesLib) makeScript;
inherit (omnibusLib.makes) makeScript;
in
{
makeScript = makeScript;
scripts =
(omnibusLib.pops.scripts.addLoadExtender {
load = {
src = ./__fixture;
};
}).exports.default;

inherit makeScript;
}
14 changes: 6 additions & 8 deletions tests/nixos/_pops.nix
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
{
omnibus,
root,
flops,
haumea,
}:
(omnibus.pops.exporter.addLoadExtender {
load = {
src = ./__fixture;
(omnibus.pops.load {
src = ./__fixture;
inputs = {
data = root.data;
inputs = {
data = root.data;
inputs = {
inherit (omnibus.flake.inputs) darwin nixpkgs home-manager;
};
inherit (omnibus.flake.inputs) darwin nixpkgs home-manager;
};
};
})
File renamed without changes.
File renamed without changes.

0 comments on commit b057d85

Please sign in to comment.