refactor: (std) update format

Author: GTrunSec

flake.nix

@@ -1,27 +1,43 @@
 {
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    nixpkgs-julia.url = "github:NixOS/nixpkgs/?ref=refs/pull/225513/head";
     call-flake.url = "github:divnix/call-flake";
   };
-  outputs = inputs: let
-    std = inputs.call-flake ./nix/std;
+  outputs =
+    inputs:
+    let
+      std = inputs.call-flake ./nix/std;
       eachSystem = inputs.nixpkgs.lib.genAttrs [
         "x86_64-linux"
         "x86_64-darwin"
         "aarch64-linux"
         "aarch64-darwin"
       ];
-  in (eachSystem (system: std.${system})) // {
-    inherit (std) lib packages devShells overlays;
-    templates = {
-      devshell = {
-        description = "The devshell template which contains several Julia Packages";
-        path = ./templates/dev;
+      src = std.inputs.omnibus.inputs.flops.haumea.pops.default.setInit {
+        load = {
+          src = ./nix/src;
+          inputs = std.inputs // inputs;
+        };
       };
-      jlrs = {
-        description = "The tempalte which contains jlrs development of Nix";
-        path = ./templates/jlrs;
+    in
+    (eachSystem (system: std.${system}))
+    // {
+      inherit (std)
+        lib
+        packages
+        devShells
+        overlays
+      ;
+      templates = {
+        devshell = {
+          description = "The devshell template which contains several Julia Packages";
+          path = ./templates/dev;
+        };
+        jlrs = {
+          description = "The tempalte which contains jlrs development of Nix";
+          path = ./templates/jlrs;
+        };
       };
     };
-  };
 }

nix/std/cells/julia2nix/compiler/default.nix

@@ -1,5 +1 @@
-{
-  inputs,
-  cell,
-}: {
-}
+{ inputs, cell }: { }

nix/std/cells/julia2nix/nixago/Manifest.toml renamed to nix/std/cells/julia2nix/configs/Manifest.toml

@@ -1,7 +1,5 @@
-{
-  inputs,
-  cell,
-}: let
+{ inputs, cell }:
+let
   inherit (inputs) nixpkgs;
   l = inputs.nixpkgs.lib // builtins;
   inherit (nixpkgs) stdenv;
@@ -26,24 +24,36 @@
       chmod +x $out/bin/*.jl
     '';
     package = cell.lib.julia-wrapped {
-      makeWrapperArgs = [
-        "--add-flags --compile=min"
-      ];
+      makeWrapperArgs = [ "--add-flags --compile=min" ];
     };
   };
-in {
+  configs =
+    let
+      inputs' = (inputs.omnibus.pops.flake.setSystem nixpkgs.system).inputs;
+    in
+    inputs.omnibus.pops.configs.addLoadExtender { load.inputs.inputs = inputs'; };
+  inherit (configs.layouts.default) treefmt lefthook conform;
+in
+{
   inherit juliaFormatter;
 
-  # treefmt = std-data-collection.data.configs.treefmt {
-  #   data.formatter.prettier = {
-  #     excludes = ["Manifest.toml" "Project.toml" "generated.json" "julia2nix.toml"];
-  #   };
-  #   data.formatter.nix = {
-  #     excludes = ["generated.nix"];
-  #   };
-  #   data.formatter.julia = l.mkIf stdenv.isLinux {
-  #     command = "${juliaFormatter}/bin/format.jl";
-  #     includes = ["*.jl"];
-  #   };
-  # };
+  treefmt = treefmt // {
+    custom = {
+      data.formatter.prettier = {
+        excludes = [
+          "Manifest.toml"
+          "Project.toml"
+          "generated.json"
+          "julia2nix.toml"
+        ];
+      };
+      data.formatter.nix = {
+        excludes = [ "generated.nix" ];
+      };
+      data.formatter.julia = l.mkIf stdenv.isLinux {
+        command = "${juliaFormatter}/bin/format.jl";
+        includes = [ "*.jl" ];
+      };
+    };
+  };
 }

nix/std/cells/julia2nix/nixago/Project.toml renamed to nix/std/cells/julia2nix/configs/Project.toml

@@ -1,12 +1,11 @@
+{ inputs, cell }:
 {
-  inputs,
-  cell,
-}: {
   config,
   lib,
   pkgs,
   ...
-}: {
+}:
+{
   commands = [
     {
       name = "checks-GR";

nix/std/cells/julia2nix/nixago/default.nix renamed to nix/std/cells/julia2nix/configs/default.nix

@@ -1,8 +1,7 @@
+{ inputs, cell }@args:
+let
+in
 {
-  inputs,
-  cell,
-} @ args: let
-in {
   packages = import ./packages.nix args;
   checks = import ./checks.nix args;
   dev = import ./dev.nix args;

nix/std/cells/julia2nix/nixago/format.jl renamed to nix/std/cells/julia2nix/configs/format.jl

@@ -1,19 +1,18 @@
+{ inputs, cell }:
 {
-  inputs,
-  cell,
-}: {
   config,
   lib,
   pkgs,
   ...
-}: {
+}:
+{
   commands = lib.optionals pkgs.stdenv.buildPlatform.isLinux [
     {
       name = "jlfmt";
       category = "dev";
       help = "Julia formatter";
       command = ''
-        ${cell.nixago.juliaFormatter}/bin/format.jl "$@"
+        ${cell.configs.juliaFormatter}/bin/format.jl "$@"
       '';
     }
   ];