add doctrine

doctrine/default.nix

@@ -0,0 +1,12 @@
+{
+  pkgs,
+  namespace,
+}: let
+  doctrine = {
+    lib = import ./lib {inherit lib pkgs doctrine;};
+    prefix = "trivium";
+    inherit namespace;
+  };
+  inherit (pkgs) lib;
+in
+  doctrine

doctrine/lib/default.nix

@@ -0,0 +1,10 @@
+{
+  lib,
+  doctrine,
+  pkgs,
+}: let
+  close = f: args: f (args // {inherit lib pkgs doctrine;});
+in {
+  importAll = pkgs.callPackage ./importAll.nix {};
+  mkModule = close (import ./mk-module.nix);
+}

doctrine/lib/mk-module.nix

@@ -0,0 +1,38 @@
+{
+  name,
+  hm ? null,
+  sys ? null,
+  options ? null,
+  lib,
+  config,
+  pkgs,
+  doctrine,
+}: let
+  optionsSet = import options {
+    inherit config lib pkgs cfg name doctrine;
+  };
+
+  configSet = import configFiles.${doctrine.namespace} {
+    inherit config lib pkgs doctrine cfg;
+  };
+
+  configFiles = lib.filterAttrs (k: v: v != null) {
+    inherit sys hm;
+  };
+
+  cfg = config.${doctrine.prefix}.${name};
+in {
+  config =
+    lib.optionalAttrs (configFiles ? ${doctrine.namespace})
+    (lib.mkIf cfg.enable configSet);
+
+  options = lib.optionalAttrs (options
+    != null
+    && optionsSet ? ${doctrine.namespace}) {
+    ${doctrine.prefix}.${name} =
+      optionsSet.${doctrine.namespace}
+      // {
+        enable = lib.mkEnableOption name;
+      };
+  };
+}

flake.nix

@@ -45,8 +45,8 @@
         trivium = overlay;
       };
 
-      homeManagerModules.default = ./hm;
-      nixosModules.default = ./nixos;
+      homeManagerModules.default = ./modules;
+      nixosModules.default = ./modules;
 
       lib = {
         mkSystemFlake = {

hm/default.nix

@@ -1 +0,0 @@
-{}

modules/default.nix

@@ -0,0 +1,3 @@
+{
+  imports = [];
+}

nixos/default.nix

@@ -1,8 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}: {
-  imports = [];
-}

pkgs/lib/default.nix

@@ -1,3 +0,0 @@
-{callPackage}: {
-  importAll = callPackage ./importAll.nix {};
-}

pkgs/spliit/default.nix

@@ -4,15 +4,14 @@
   nodePackages,
   lib,
   writeShellScriptBin,
-  pkgs
-}:
-let 
+  pkgs,
+}: let
   schemaEngine = "${pkgs.prisma-engines}/bin/schema-engine";
   queryEngineBin = "${pkgs.prisma-engines}/bin/query-engine";
   queryEngineLib = "${pkgs.prisma-engines}/lib/libquery_engine.node";
-  buildFlags = [ "--ignore-scripts" ];
+  buildFlags = ["--ignore-scripts"];
 in
-buildNpmPackage {
+  buildNpmPackage {
     pname = "spliit2";
     version = "master-20250420";
 
@@ -26,7 +25,7 @@ buildNpmPackage {
 
     npmDepsHash = "sha256-sd0/7ruNUFxUKTeTwx/v8Vc/G3llkXP6RSDE78h3qVU=";
 
-  nativeBuildInputs = [ pkgs.openssl ];
+    nativeBuildInputs = [pkgs.openssl];
 
     npmRebuildFlags = buildFlags;
 
@@ -65,7 +64,7 @@ buildNpmPackage {
         --replace @out@ $out
 
       wrapProgram $out/bin/spliit2 \
-      --prefix PATH : ${lib.makeBinPath [ pkgs.openssl ]}
+        --prefix PATH : ${lib.makeBinPath [pkgs.openssl]}
     '';
 
     meta = {
@@ -74,4 +73,4 @@ buildNpmPackage {
       license = lib.licenses.mit;
       maintainers = with lib.maintainers; [];
     };
-}
+  }