clan-config: move jsonschema lib to clanLib

lib/default.nix

@@ -1,17 +1,16 @@
 { lib, ... }:
-let
+{
-  clanLib = {
+  findNixFiles = folder:
-    findNixFiles = folder:
+    lib.mapAttrs'
-      lib.mapAttrs'
+      (name: type:
-        (name: type:
+        if
-          if
+          type == "directory"
-            type == "directory"
+        then
-          then
+          lib.nameValuePair name "${folder}/${name}"
-            lib.nameValuePair name "${folder}/${name}"
+        else
-          else
+          lib.nameValuePair (lib.removeSuffix ".nix" name) "${folder}/${name}"
-            lib.nameValuePair (lib.removeSuffix ".nix" name) "${folder}/${name}"
+      )
-        )
+      (builtins.readDir folder);
-        (builtins.readDir folder);
+
-  };
+  jsonschema = import ./jsonschema.nix { inherit lib; };
-in
+}
-clanLib

pkgs/clan-cli/clan_cli/config/__init__.py

@@ -1,6 +1,7 @@
 # !/usr/bin/env python3
 import argparse
 import json
+import os
 import subprocess
 import sys
 from pathlib import Path
@@ -8,6 +9,8 @@ from typing import Any, Optional, Type, Union
 
 from clan_cli.errors import ClanError
 
+CLAN_FLAKE = os.getenv("CLAN_FLAKE")
+
 
 class Kwargs:
     def __init__(self) -> None:
@@ -27,7 +30,7 @@ def schema_from_module_file(
     nix_expr = f"""
         let
             lib = import <nixpkgs/lib>;
-            slib = import {__file__}/../schema-lib.nix {{inherit lib;}};
+            slib = import {CLAN_FLAKE}/lib/jsonschema.nix {{inherit lib;}};
         in
             slib.parseModule {absolute_path}
     """

pkgs/clan-cli/shell.nix

@@ -9,7 +9,7 @@ let
     ]
   );
   checkScript = pkgs.writeScriptBin "check" ''
-    nix build -f . tests -L "$@"
+    nix build .#checks.${pkgs.system}.{treefmt,clan-mypy,clan-pytest} -L "$@"
   '';
 in
 pkgs.mkShell {

pkgs/clan-cli/tests/config/test_parseOption.nix

@@ -1,7 +1,7 @@
 # tests for the nixos options to jsonschema converter
 # run these tests via `nix-unit ./test.nix`
 { lib ? (import <nixpkgs> { }).lib
-, slib ? import ../../clan_cli/config/schema-lib.nix { inherit lib; }
+, slib ? import ../../../../lib/jsonschema.nix { inherit lib; }
 }:
 let
   description = "Test Description";

pkgs/clan-cli/tests/config/test_parseOptions.nix

@@ -1,7 +1,7 @@
 # tests for the nixos options to jsonschema converter
 # run these tests via `nix-unit ./test.nix`
 { lib ? (import <nixpkgs> { }).lib
-, slib ? import ../../clan_cli/config/schema-lib.nix { inherit lib; }
+, slib ? import ../../../../lib/jsonschema.nix { inherit lib; }
 }:
 let
   evaledOptions =