chore: updat omnibus

flake.nix

@@ -3,13 +3,17 @@
 
   inputs = {
     omnibus.url = "github:gtrunsec/omnibus";
+    omnibus.flake = false;
   };
 
   outputs =
-    {self, omnibus}@inputs:
+    { self, omnibus }@inputs:
     let
-      src = import ./nix/src/__init.nix {inherit inputs omnibus;};
-      inherit (omnibus.lib) mapPopsExports;
+      src = import ./nix/src/__init.nix {
+        inputs = inputs // {
+          omnibus = import inputs.omnibus;
+        };
+      };
     in
     src.flakeOutputs
     // {

nix/lock/flake.nix

@@ -7,5 +7,5 @@
     ansible-collection-hardening.flake = false;
   };
 
-  outputs = _: {};
+  outputs = _: { };
 }

nix/src/__init.nix

@@ -1,4 +1,4 @@
-{omnibus, inputs}:
+{ inputs }:
 let
   inherit (inputs.omnibus.inputs.flops.inputs.nixlib) lib;
   eachSystem = lib.genAttrs [
@@ -7,10 +7,10 @@ let
     "aarch64-darwin"
   ];
 in
-omnibus.load {
+inputs.omnibus.load {
   src = ./.;
   inputs = {
     projectDir = ../..;
-    inherit inputs eachSystem;
+    inherit eachSystem;
   };
 }

nix/src/flakeOutputs.nix

@@ -1,6 +1,6 @@
-{root, lib}:
+{ root, lib }:
 let
-  units = lib.mapPopsExports root.pops;
+  units = lib.omnibus.mapPopsExports root.pops;
 in
 {
   inherit (units) nixosProfiles;

nix/src/pops/lego.nix

@@ -5,5 +5,5 @@
 }:
 omnibus.pops.load {
   src = projectDir + /units/lego;
-  inputs = {};
+  inputs = { };
 }

nix/std/cells/repo/nixago.nix

@@ -1,4 +1,4 @@
-{inputs, cell}:
+{ inputs, cell }:
 with inputs.std.inputs.dmerge;
 let
   cfg = {
@@ -18,7 +18,7 @@ in
     default = conform.default custom;
     custom = {
       data = {
-        commit.conventional.scopes = append [".*."];
+        commit.conventional.scopes = append [ ".*." ];
       };
     };
   };

nix/std/cells/repo/pops.nix

@@ -1,4 +1,4 @@
-{inputs, cell}:
+{ inputs, cell }:
 let
   inherit (inputs) nixpkgs;
   inputs' = (inputs.omnibus.pops.flake.setSystem nixpkgs.system).inputs;
@@ -15,7 +15,7 @@ in
         POP.extendPop flops.haumea.pops.exporter (
           _self: _super: {
             exports = rec {
-              inherit (inputs.omnibus.lib.mapPopsExports pops) self;
+              inherit (inputs.omnibus.lib.omnibus.mapPopsExports pops) self;
               pops.self =
                 (self.layouts.default.addLoadExtender {
                   load.inputs = {

nix/std/cells/repo/shells/default.nix

@@ -1,14 +1,14 @@
-{inputs, cell}:
+{ inputs, cell }:
 let
   l = nixpkgs.lib // builtins;
   inherit (inputs) nixpkgs std;
 in
 l.mapAttrs (_: std.lib.dev.mkShell) {
   default =
-    {...}:
+    { ... }:
     {
       name = "LEGO Hardening";
-      imports = [cell.pops.devshellProfiles.exports.default.nickel];
+      imports = [ cell.pops.devshellProfiles.exports.default.nickel ];
 
       packages = [
         nixpkgs.vagrant

nix/std/cells/repo/tasks/default.nix

@@ -1,4 +1,4 @@
-{inputs, cell}:
+{ inputs, cell }:
 let
   inherit (inputs.std-ext.writers.lib) writeShellApplication;
   inherit (inputs) self nixpkgs std;
@@ -8,11 +8,11 @@ in
     let
       org-roam-book =
         inputs.org-roam-book-template.packages.${nixpkgs.system}.default.override
-          {org = "${(std.incl self [(self + /docs/org)])}/docs/org";};
+          { org = "${(std.incl self [ (self + /docs/org) ])}/docs/org"; };
     in
     writeShellApplication {
       name = "mkdoc";
-      runtimeInputs = [nixpkgs.hugo];
+      runtimeInputs = [ nixpkgs.hugo ];
       text = ''
         rsync -avzh ${org-roam-book}/* docs/publish
         cd docs/publish && cp ../config.toml .

nix/std/flake.nix

@@ -19,7 +19,7 @@
     std.follows = "omnibusStd/std";
   };
   outputs =
-    {std, call-flake, ...}@inputs:
+    { std, call-flake, ... }@inputs:
     std.growOn
       {
         inputs =
@@ -28,6 +28,7 @@
           // (call-flake ../..).inputs
           // {
             lego-hardening = call-flake ../..;
+            omnibus = import (call-flake ../..).inputs.omnibus;
           };
         cellsFrom = ./cells;
 

units/apparmor/_temp.nix

@@ -1,5 +1,5 @@
 _:
-{pkgs}:
+{ pkgs }:
 {
   bin =
     {
@@ -14,7 +14,7 @@ _:
           # include <abstractions/base>
           # include <abstractions/nameservice>
           # include <abstractions/ssl_certs>
-          include "${pkgs.apparmorRulesFromClosure {inherit name;} package}"
+          include "${pkgs.apparmorRulesFromClosure { inherit name; } package}"
           r ${package}/bin/${name},
         }
         ${extraRules}

units/apparmor/default.nix

@@ -4,7 +4,7 @@
   pkgs,
 }:
 let
-  temp = super.temp {inherit pkgs;};
+  temp = super.temp { inherit pkgs; };
   binary_example = temp.bin {
     name = "binary_example";
     package = pkgs.binary_example;